[tor-commits] [orbot/master] updating project files

[n8fr8 at torproject.org]

commit d6692610e407216eefa80e620ead193110bcec9e
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Oct 28 11:25:12 2011 -0400

    updating project files
---
 .classpath          |    1 +
 AndroidManifest.xml |   19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.classpath b/.classpath
index 44abe8e..1182977 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/jtorctrl.jar"/>
+	<classpathentry kind="lib" path="libs/whispercore.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 781581d..6b7aac3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.torproject.android" android:versionName="0.2.3.1-orbot-alpha-1.0.5.3" android:versionCode="16">
+      package="org.torproject.android" android:versionName="tor-0.2.3.6-alpha-orbot-1.0.6" android:versionCode="17">
        
        <uses-permission android:name="android.permission.INTERNET" />
  		<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
  
-    <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
+    <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon"
+     android:label="@string/app_name" android:debuggable="true">
       
         <activity android:name=".Orbot"
                   android:theme="@android:style/Theme.NoTitleBar">
@@ -29,13 +30,13 @@
             </intent-filter>
         </activity>
       	
-      	<activity android:name=".LotsaText"/>
-      	<activity android:name=".Permissions"/>
-      	<activity android:name=".TipsAndTricks"/>
-      	<activity android:name=".ConfigureTransProxy"/>
-      	<activity android:name=".SettingsPreferences"  android:label="@string/app_name"/>
-        <activity android:name=".AppManager"  android:label="@string/app_name"/>
-        <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
+      	<activity android:name=".wizard.LotsaText"/>
+      	<activity android:name=".wizard.Permissions"/>
+      	<activity android:name=".wizard.TipsAndTricks"/>
+      	<activity android:name=".wizard.ConfigureTransProxy"/>
+      	
+      	<activity android:name=".settings.SettingsPreferences"  android:label="@string/app_name"/>
+        <activity android:name=".settings.AppManager"  android:label="@string/app_name"/>
       
     	<service android:enabled="true"
     		android:name=".service.TorService"