open-keychain/OpenKeychain/src/main/res/values
Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
..
arrays.xml Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
attr.xml Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
colors.xml ui: apply purple theme (twi is best color) 2014-05-06 19:18:32 +02:00
dimens.xml Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
ids.xml Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
static_strings.xml Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
strings.xml Merge remote-tracking branch 'origin/master' into external-test 2014-07-11 21:00:26 +02:00
styles.xml Always use section style instead of custom class 2014-05-06 22:48:47 +02:00