diff options
Diffstat (limited to 'main')
41 files changed, 89 insertions, 29 deletions
diff --git a/main/build.gradle b/main/build.gradle index 376b8edf..8231fdf8 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -107,6 +107,11 @@ android { } +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + // ~/.gradle/gradle.properties if (project.hasProperty('keystoreFile') && project.hasProperty('keystorePassword') && diff --git a/main/src/main/java/de/blinkt/openvpn/core/Connection.java b/main/src/main/java/de/blinkt/openvpn/core/Connection.java index a12dfcaf..b10664ce 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/Connection.java +++ b/main/src/main/java/de/blinkt/openvpn/core/Connection.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java b/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java index 945d6bd4..440458e4 100644 --- a/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java +++ b/main/src/main/java/de/blinkt/openvpn/core/LollipopDeviceStateListener.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java b/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java index 6aef0bb1..3251fc0a 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java index 2042751d..d02dfd47 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java index c81db0bc..55cce60b 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.fragments; diff --git a/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java b/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java index e41583bf..3847afe9 100644 --- a/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java +++ b/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.views; diff --git a/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java b/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java index 105f5d6b..488e22af 100644 --- a/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java +++ b/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.views; diff --git a/main/src/main/java/org/spongycastle/util/encoders/Base64.java b/main/src/main/java/org/spongycastle/util/encoders/Base64.java index 87bd80a0..0993e7be 100644 --- a/main/src/main/java/org/spongycastle/util/encoders/Base64.java +++ b/main/src/main/java/org/spongycastle/util/encoders/Base64.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.encoders; import java.io.ByteArrayOutputStream; diff --git a/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java b/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java index 84060707..4248bb8b 100644 --- a/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java +++ b/main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.encoders; import java.io.IOException; diff --git a/main/src/main/java/org/spongycastle/util/encoders/Encoder.java b/main/src/main/java/org/spongycastle/util/encoders/Encoder.java index 106c36b7..2007ac3e 100644 --- a/main/src/main/java/org/spongycastle/util/encoders/Encoder.java +++ b/main/src/main/java/org/spongycastle/util/encoders/Encoder.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.encoders; import java.io.IOException; diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java b/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java index 0127ca0c..b9474ed3 100644 --- a/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java +++ b/main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.io.pem; import java.io.IOException; diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java b/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java index 4adb815e..6d655c87 100644 --- a/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java +++ b/main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.io.pem; public class PemHeader diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java b/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java index 6f7c79c5..59186e09 100644 --- a/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java +++ b/main/src/main/java/org/spongycastle/util/io/pem/PemObject.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.io.pem; import java.util.ArrayList; diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java b/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java index 1a8cea6d..ddce091c 100644 --- a/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java +++ b/main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.io.pem; public interface PemObjectGenerator diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java b/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java index 75e2c171..0b3b55c4 100644 --- a/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java +++ b/main/src/main/java/org/spongycastle/util/io/pem/PemReader.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.io.pem; import java.io.BufferedReader; diff --git a/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java b/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java index f5a6a363..25730efd 100644 --- a/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java +++ b/main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2012-2014 Arne Schwabe + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + */ + package org.spongycastle.util.io.pem; import java.io.BufferedWriter; diff --git a/main/src/main/res/anim/fab_anim.xml b/main/src/main/res/anim/fab_anim.xml index 40d72b9a..9bed908d 100644 --- a/main/src/main/res/anim/fab_anim.xml +++ b/main/src/main/res/anim/fab_anim.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/drawable/bg_rect_round.xml b/main/src/main/res/drawable/bg_rect_round.xml index 0eab3696..f155ad55 100644 --- a/main/src/main/res/drawable/bg_rect_round.xml +++ b/main/src/main/res/drawable/bg_rect_round.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/drawable/bg_switchbar.xml b/main/src/main/res/drawable/bg_switchbar.xml index 1f6d3c92..0d133c3e 100644 --- a/main/src/main/res/drawable/bg_switchbar.xml +++ b/main/src/main/res/drawable/bg_switchbar.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/drawable/bg_tabs.xml b/main/src/main/res/drawable/bg_tabs.xml index 129a637d..6fa5f5eb 100644 --- a/main/src/main/res/drawable/bg_tabs.xml +++ b/main/src/main/res/drawable/bg_tabs.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/drawable/oval_ripple.xml b/main/src/main/res/drawable/oval_ripple.xml index 8b07bb3d..a4f8fc9b 100644 --- a/main/src/main/res/drawable/oval_ripple.xml +++ b/main/src/main/res/drawable/oval_ripple.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/drawable/slidingtab_background.xml b/main/src/main/res/drawable/slidingtab_background.xml index 885cf036..82e1cde3 100644 --- a/main/src/main/res/drawable/slidingtab_background.xml +++ b/main/src/main/res/drawable/slidingtab_background.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + --> + <selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime"> <item android:state_pressed="true" android:drawable="@color/background_tab_pressed" /> diff --git a/main/src/main/res/drawable/white_rect.xml b/main/src/main/res/drawable/white_rect.xml index da286e5b..5ead4b9b 100644 --- a/main/src/main/res/drawable/white_rect.xml +++ b/main/src/main/res/drawable/white_rect.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/layout-v21/connection_fab.xml b/main/src/main/res/layout-v21/connection_fab.xml index 0392539a..8910dc8d 100644 --- a/main/src/main/res/layout-v21/connection_fab.xml +++ b/main/src/main/res/layout-v21/connection_fab.xml @@ -3,7 +3,7 @@ <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <ImageButton xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout-v21/profile_list_fabs.xml b/main/src/main/res/layout-v21/profile_list_fabs.xml index 121225ae..5ea6512d 100644 --- a/main/src/main/res/layout-v21/profile_list_fabs.xml +++ b/main/src/main/res/layout-v21/profile_list_fabs.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <merge xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout-v21/share_fab.xml b/main/src/main/res/layout-v21/share_fab.xml index 9e7e4e6c..25576636 100644 --- a/main/src/main/res/layout-v21/share_fab.xml +++ b/main/src/main/res/layout-v21/share_fab.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <ImageButton xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout-v21/tabs.xml b/main/src/main/res/layout-v21/tabs.xml index 66f55938..147b0bc2 100644 --- a/main/src/main/res/layout-v21/tabs.xml +++ b/main/src/main/res/layout-v21/tabs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <merge xmlns:blinkt="http://schemas.android.com/apk/res-auto"> diff --git a/main/src/main/res/layout/allowed_application_layout.xml b/main/src/main/res/layout/allowed_application_layout.xml index 6eaaf8a3..402c3162 100644 --- a/main/src/main/res/layout/allowed_application_layout.xml +++ b/main/src/main/res/layout/allowed_application_layout.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <GridLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout/allowed_vpn_apps.xml b/main/src/main/res/layout/allowed_vpn_apps.xml index 53c48fd8..ff015fca 100644 --- a/main/src/main/res/layout/allowed_vpn_apps.xml +++ b/main/src/main/res/layout/allowed_vpn_apps.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout/connection_fab.xml b/main/src/main/res/layout/connection_fab.xml index cb3669c5..e3cae9ab 100644 --- a/main/src/main/res/layout/connection_fab.xml +++ b/main/src/main/res/layout/connection_fab.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <merge xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout/connections.xml b/main/src/main/res/layout/connections.xml index f0ac44a7..57c575d8 100644 --- a/main/src/main/res/layout/connections.xml +++ b/main/src/main/res/layout/connections.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout/main_activity.xml b/main/src/main/res/layout/main_activity.xml index 0b0aa8fe..6ce41da5 100644 --- a/main/src/main/res/layout/main_activity.xml +++ b/main/src/main/res/layout/main_activity.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/main/src/main/res/layout/padersliding_tab.xml b/main/src/main/res/layout/padersliding_tab.xml index 80b104b5..995047d6 100644 --- a/main/src/main/res/layout/padersliding_tab.xml +++ b/main/src/main/res/layout/padersliding_tab.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt + --> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/tab_title" android:layout_width="match_parent" diff --git a/main/src/main/res/layout/profile_list_fabs.xml b/main/src/main/res/layout/profile_list_fabs.xml index 4ec98330..2ed79610 100644 --- a/main/src/main/res/layout/profile_list_fabs.xml +++ b/main/src/main/res/layout/profile_list_fabs.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <merge />
\ No newline at end of file diff --git a/main/src/main/res/layout/server_card.xml b/main/src/main/res/layout/server_card.xml index 20b7e0d5..1f59a99f 100644 --- a/main/src/main/res/layout/server_card.xml +++ b/main/src/main/res/layout/server_card.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <FrameLayout xmlns:tools="http://schemas.android.com/tools" diff --git a/main/src/main/res/layout/share_fab.xml b/main/src/main/res/layout/share_fab.xml index c98b044d..42824279 100644 --- a/main/src/main/res/layout/share_fab.xml +++ b/main/src/main/res/layout/share_fab.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <merge> diff --git a/main/src/main/res/layout/tabs.xml b/main/src/main/res/layout/tabs.xml index 56a24ebe..0109d59e 100644 --- a/main/src/main/res/layout/tabs.xml +++ b/main/src/main/res/layout/tabs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <merge> diff --git a/main/src/main/res/menu/connections.xml b/main/src/main/res/menu/connections.xml index 27a7a47f..c1874227 100644 --- a/main/src/main/res/menu/connections.xml +++ b/main/src/main/res/menu/connections.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/menu/main_menu.xml b/main/src/main/res/menu/main_menu.xml index 3b7479fb..ed633724 100644 --- a/main/src/main/res/menu/main_menu.xml +++ b/main/src/main/res/menu/main_menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 99cf503b..9c0a1823 100755 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2012-2014 Arne Schwabe - ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <resources> <string name="app">OpenVPN for Android</string> |