Vincent Breitmoser 377d0f09fa Merge branch 'ditch-appmsg' ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java

2014-07-29 13:53:18 +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

get rid of AppMsg library

2014-07-07 17:33:25 +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 branch 'ditch-appmsg'

2014-07-29 13:53:18 +02:00

styles.xml

Always use section style instead of custom class

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