diff options
| author | Andrew Dolgov <[email protected]> | 2012-12-31 03:15:27 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-12-31 03:15:27 +0400 |
| commit | fc4111ae22ad7987bef3fae6f4e61b4adc60064c (patch) | |
| tree | 11d78c183452042693bc6e75a7b6f628ef11cf0a /AndroidManifest.xml | |
| parent | adee6d3493a52a303d3c124768d73b5fa52fb68e (diff) | |
| parent | d4e823efcc09a01b88ea37640ea7281b478efc1b (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb
Conflicts:
res/values/strings.xml
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index df98441d..ebf91fe0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="122" - android:versionName="1.0" > + android:versionCode="123" + android:versionName="1.1" > <uses-sdk android:minSdkVersion="8" |