From dca67df888680da70235ce402e42e05945f67cb8 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 23 Apr 2012 00:07:02 +0200
Subject: Doing progress on the Preference dialog chaos

--HG--
rename : res/layout/config.xml => res/layout/basic_settings.xml
rename : src/de/blinkt/openvpn/AboutActivity.java => src/de/blinkt/openvpn/AboutFragment.java
---
 AndroidManifest.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 24c8f164..332947dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,27 +24,27 @@
 
     <uses-sdk android:minSdkVersion="14" />
 
-    <!--  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
-
+    <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
 
     <application
-	  android:debuggable="true" 
+        android:debuggable="true"
         android:icon="@drawable/icon"
         android:label="@string/app" >
-
         <activity android:name="com.lamerman.FileDialog" />
-        <activity android:name=".AboutActivity" />
+        <activity android:name=".AboutFragment" />
         <activity android:name=".VPNPreferences" />
         <activity android:name=".LogWindow" />
-        <activity
-            android:name=".OpenVPNClient"
-            android:configChanges="orientation|keyboardHidden" >
+        <activity android:name=".MainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".OpenVPNClient"
+            android:configChanges="orientation|keyboardHidden" >
+        </activity>
 
         <service
             android:name=".OpenVpnService"
-- 
cgit v1.2.3