diff options
| author | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
|---|---|---|
| committer | goblin911 <goblinliu@gmail.com> | 2013-08-25 21:16:45 +0800 |
| commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
| tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/Piztor/AndroidManifest.xml | |
| parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
| parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) | |
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts:
client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
client/Piztor/gen/com/macaroon/piztor/R.java
client/Piztor/res/values/strings.xml
client/bin/classes/com/macaroon/piztor/ActStatus.class
client/bin/classes/com/macaroon/piztor/EmptyStatus.class
client/bin/classes/com/macaroon/piztor/Setting.class
client/src/com/macaroon/piztor/AppMgr.java
client/src/com/macaroon/piztor/Setting.java
Diffstat (limited to 'client/Piztor/AndroidManifest.xml')
| -rw-r--r-- | client/Piztor/AndroidManifest.xml | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml deleted file mode 100644 index b18d8e2..0000000 --- a/client/Piztor/AndroidManifest.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.macaroon.piztor" - android:versionCode="1" - android:versionName="1.0" > - - <uses-sdk - android:minSdkVersion="8" - android:targetSdkVersion="17" /> - - <application - android:allowBackup="true" - android:icon="@drawable/ic_launcher" - android:label="@string/app_name" - android:theme="@android:style/Theme.Black.NoTitleBar" > - <activity - android:name="com.macaroon.piztor.InitAct" - android:label="@string/app_name" > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - <activity - android:name="com.macaroon.piztor.Login" - android:label="@string/title_activity_login" > - </activity> - <activity - android:name="com.macaroon.piztor.Main" - android:label="@string/title_activity_main" > - </activity> - <activity - android:name="com.macaroon.piztor.Setting" - android:label="@string/title_activity_setting" > - </activity> - </application> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> - -</manifest> |