Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml

2014-06-18 21:09:04 +02:00

..

arrays.xml

can search openkeychain, retrieve & install & use keys from there

2014-04-29 15:04:05 -07: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 branch 'new-edit'

2014-06-18 21:09:04 +02:00

styles.xml

Always use section style instead of custom class

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