summaryrefslogtreecommitdiff
path: root/client/Piztor/AndroidManifest.xml
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-27 08:48:13 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-27 08:48:13 +0800
commit3849201b28bc38bb8b42574bdf847dd7a5ce8aa7 (patch)
tree922a19e548553fb500252e131c6b2745eeca7648 /client/Piztor/AndroidManifest.xml
parentae935e1c38c7ffe662fa3381b0a5bd8b91c72b49 (diff)
parent0cfa72f9f352a81ff40ce41d2a94aa4f63d3a815 (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/AndroidManifest.xml')
-rw-r--r--client/Piztor/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml
index b18d8e2..ef91844 100644
--- a/client/Piztor/AndroidManifest.xml
+++ b/client/Piztor/AndroidManifest.xml
@@ -31,8 +31,8 @@
android:label="@string/title_activity_main" >
</activity>
<activity
- android:name="com.macaroon.piztor.Setting"
- android:label="@string/title_activity_setting" >
+ android:name="com.macaroon.piztor.Settings"
+ android:label="@string/title_activity_settings" >
</activity>
</application>