merge 1.0.x back into trunk

2010-06-30 19:59:33 +00:00
parent 933ec4f7b6
commit 16cea885e2
45 changed files with 21 additions and 32 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="org.thialfihar.android.apg"
-    android:versionCode="18" android:versionName="1.0.4">
+    android:versionCode="19" android:versionName="1.0.5">

    <application
        android:icon="@drawable/icon"