summaryrefslogtreecommitdiff
path: root/client/Piztor/bin
diff options
context:
space:
mode:
authorgoblin911 <[email protected]>2013-08-25 21:16:45 +0800
committergoblin911 <[email protected]>2013-08-25 21:16:45 +0800
commit2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch)
treea85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/Piztor/bin
parente5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff)
parent263967cbb477983ae8680b431c1d93f102971c30 (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/bin')
-rw-r--r--client/Piztor/bin/AndroidManifest.xml42
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.classbin2797 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.classbin328 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.classbin1412 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.classbin4548 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.classbin347 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.classbin471 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/InitAct.classbin1136 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.classbin2205 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$attr.classbin343 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.classbin464 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.classbin1399 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$id.classbin2291 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$layout.classbin823 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$menu.classbin479 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$string.classbin937 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$style.classbin434 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R.classbin683 -> 0 bytes
18 files changed, 0 insertions, 42 deletions
diff --git a/client/Piztor/bin/AndroidManifest.xml b/client/Piztor/bin/AndroidManifest.xml
deleted file mode 100644
index b18d8e2..0000000
--- a/client/Piztor/bin/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>
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class b/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
deleted file mode 100644
index 786ec1d..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class
deleted file mode 100644
index 15cc794..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class
deleted file mode 100644
index f11e546..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class b/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
deleted file mode 100644
index 41f9ead..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class b/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class
deleted file mode 100644
index 566eb01..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class
deleted file mode 100644
index 74aa729..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class b/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class
deleted file mode 100644
index 487831d..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class b/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class
deleted file mode 100644
index 4a3fc81..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class
deleted file mode 100644
index a95e1ab..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class
deleted file mode 100644
index 4bc657f..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
deleted file mode 100644
index b31a626..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
deleted file mode 100644
index e08c969..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
deleted file mode 100644
index de25e3c..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
deleted file mode 100644
index 7f7cacb..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
deleted file mode 100644
index 65d1b80..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class b/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class
deleted file mode 100644
index 052dd30..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/R.class b/client/Piztor/bin/classes/com/macaroon/piztor/R.class
deleted file mode 100644
index d173856..0000000
--- a/client/Piztor/bin/classes/com/macaroon/piztor/R.class
+++ /dev/null
Binary files differ