Dominik Schürmann bb2d80bfc8 Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development ...

Conflicts:
	OpenKeychain/src/main/res/values/strings.xml

2015-03-04 20:54:11 +01:00

..

arrays.xml

Fix onTouchEvent delegation, with workaround for Android bug

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

attr.xml

First work on new key view toolbar

2015-02-25 02:35:09 +01:00

colors.xml

Re-add black color

2015-03-02 16:29:40 +01:00

dimens.xml

Fix toolbar margins on Android lower 5

2015-03-03 20:15:09 +01:00

ids.xml

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

strings.xml

Merge branch 'development' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-development

2015-03-04 20:54:11 +01:00

styles.xml

Hopefully fixes drop down icon for spinners on Android lower 5

2015-02-26 17:32:08 +01:00

themes.xml

Remove old Holo design resources

2015-02-26 17:37:28 +01:00