Vincent Breitmoser e457d4c909 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml

2014-09-15 14:00:17 +02:00

..

arrays.xml

Fix onTouchEvent delegation, with workaround for Android bug

2014-06-20 15:39:27 +02:00

attr.xml

Cleanup FoldableLinearLayout

2014-08-27 13:54:33 +02:00

colors.xml

Robots like coffee too...

2014-07-31 21:18:24 +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'

2014-09-15 14:00:17 +02:00

styles.xml

Always use section style instead of custom class

2014-05-06 22:48:47 +02:00