From 6fcd101fcbc7779ffd7239cc35e5c3359ae38fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 28 May 2014 17:15:44 +0200
Subject: Resources merge correctly.

---
 .../remoteExample/src/main/res/values/strings.xml         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml

(limited to 'ics-openvpn-stripped/remoteExample/src/main/res/values')

diff --git a/ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml
new file mode 100644
index 00000000..bbaee226
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">OpenVPN Remote</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+    <string name="permission_description">Allows another app to control OpenVPN</string>
+    <string name="no_status_yet">No Status yet</string>
+    <string name="no_now">Not now</string>
+    <string name="show_my_ip">Show my IP</string>
+    <string name="disconnect">Disconnect</string>
+    <string name="start_embedded">Start embedded profile</string>
+
+
+</resources>
-- 
cgit v1.2.3


From ac69881af1b7bfcdd185989f3e434556b1d62fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 10 Jun 2014 11:19:48 +0200
Subject: Grabs eip authentication data correctly.

Merged updated ics-openvpn-upstream (e7803cc8efcd1794e18b4e30a43d814c2834552d).
---
 ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml | 6 ++++++
 ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml
 create mode 100644 ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml

(limited to 'ics-openvpn-stripped/remoteExample/src/main/res/values')

diff --git a/ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..a0171a70
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    </resources>
diff --git a/ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml b/ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml
new file mode 100644
index 00000000..ff6c9d2c
--- /dev/null
+++ b/ics-openvpn-stripped/remoteExample/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>
-- 
cgit v1.2.3