moparisthebest
/
keepass2android
mirror of https://github.com/moparisthebest/keepass2android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '0.9.9' 

Conflicts:
	src/keepass2android/Properties/AndroidManifest_net.xml
This commit is contained in:
Philipp Crocoll 2015-12-29 20:41:39 +01:00
parent c7e7007bfa 850b64f178
commit 5f741f2d5f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="67"
android:versionName="1.0.0 preview 1"
android:versionCode="69"
android:versionName="1.0.0 preview 2"
package="keepass2android.keepass2android"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />

2
src/keepass2android/Resources/drawable/storagetype_grid_bg.xml
View File

@ -3,7 +3,7 @@
<item >
<shape android:shape="rectangle" >
<corners android:radius="6dip" />
<solid android:color="?activityBackgroundColor" />
<solid android:color="#fff" />
</shape>
</item>
</selector>