Vincent Breitmoser 531697ffe7 Merge remote-tracking branch 'origin/development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml

2015-03-10 04:56:51 +01:00

..

arrays.xml

Fix onTouchEvent delegation, with workaround for Android bug

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

attr.xml

Implemented Matt Allen password strength indicator

2015-03-03 16:23:43 -03: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 remote-tracking branch 'origin/development' into linked-identities

2015-03-10 04:56:51 +01:00

styles.xml

Ripple

2015-03-10 02:13:36 +01:00

themes.xml

Remove old Holo design resources

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