diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
| commit | e10cbc54c606563b2d06f083bca17119ca585127 (patch) | |
| tree | 23c71e67b1c4a381997bdb75de476f05d7dcec5f /OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml | |
| parent | bef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff) | |
| parent | acbf2a18617eea73924dd109e09189420d9876fe (diff) | |
| download | open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2 open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml index e69452db1..ef0e2626e 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_added_item.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:minWidth="10dp" - android:background="@color/result_green" /> + android:background="@color/android_green_light" /> <LinearLayout android:orientation="vertical" |