Merge branch 'master' into development

This commit is contained in:
Daniel Martí 2014-01-07 23:57:25 +01:00
commit abc3631b16
2 changed files with 3 additions and 3 deletions

View File

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fdroid.fdroid" package="org.fdroid.fdroid"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="560" android:versionCode="570"
android:versionName="0.56-test" > android:versionName="0.57-test" >
<uses-sdk <uses-sdk
android:minSdkVersion="5" android:minSdkVersion="5"

View File

@ -2,7 +2,7 @@
<resources> <resources>
<string name="app_name">F-Droid</string> <string name="app_name">F-Droid</string>
<string name="version_name">0.56-test</string> <string name="version_name">0.57-test</string>
<string name="about_sitec">https://f-droid.org</string> <string name="about_sitec">https://f-droid.org</string>
<string name="about_mailc">team@f-droid.org</string> <string name="about_mailc">team@f-droid.org</string>