Vincent Breitmoser 6bacb5ff51 Merge branch 'certify' into certs ...

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/values/strings.xml

2014-03-15 18:34:20 +01:00

..

arrays.xml

corrected commit

2014-03-07 00:43:09 +05:30

colors.xml

remove unused color

2014-03-13 20:12:57 +01:00

static_strings.xml

rename to OpenKeychain

2014-02-21 01:03:20 +01:00

strings.xml

Merge branch 'certify' into certs

2014-03-15 18:34:20 +01:00

styles.xml

Hacks to make dialogs on Android 2.3 black on white, and not black on black

2014-02-02 16:24:58 +01:00