Merge branch 'master' of github.com:open-keychain/open-keychain

2015-09-06 00:59:12 +02:00
parent 8e60bf70a1 afda9d86f8
commit d2ce770c1a
22 changed files with 52 additions and 54 deletions
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
        android:name=".KeychainApplication"
        android:allowBackup="false"
        android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/Theme.Keychain.Light">
        <activity