Merge branch 'Branch_ab41043ff158c51b41fda8502a308682fde47380'
This commit is contained in:
		| @@ -1,7 +1,7 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android"  | ||||
| 			android:versionCode="39"  | ||||
| 			android:versionName="0.9.3"  | ||||
| 			android:versionCode="42"  | ||||
| 			android:versionName="0.9.3-r5"  | ||||
| 			package="keepass2android.keepass2android_nonet" | ||||
| 			android:installLocation="auto"> | ||||
| 	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" /> | ||||
|   | ||||
| @@ -7509,7 +7509,7 @@ namespace keepass2android | ||||
| 					16843055, | ||||
| 					16843056, | ||||
| 					16843057, | ||||
| 					16843788}; | ||||
| 					16843754}; | ||||
| 			 | ||||
| 			// aapt resource value: 4 | ||||
| 			public const int MenuView_android_headerBackground = 4; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Philipp Crocoll
					Philipp Crocoll