diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-06 00:59:12 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-06 00:59:12 +0200 |
commit | d2ce770c1ab541aae20906c8e38056f24968aac4 (patch) | |
tree | c683409c17c67ba8af80edc361ce07452b964288 /OpenKeychain/src/main/AndroidManifest.xml | |
parent | 8e60bf70a1ef6bd7be3220afc45c9a59c231d2d4 (diff) | |
parent | afda9d86f84fcd36aad8de4a4e9c1fe12b6b042c (diff) | |
download | open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.tar.gz open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.tar.bz2 open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
-rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 1cd51d3c6..63e1a5ce7 100644 --- 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 |