Vincent Breitmoser 1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml

2015-04-26 01:02:22 +02:00

..

android-icon-copier

if needed change name options.templ.json

2015-03-03 12:30:56 -08:00

drawables

Merge branch 'development' into linked-identities

2015-04-24 14:18:01 +02:00

screenshots

Screenshots

2015-02-20 11:13:40 +01:00

get-material-icons.sh

Put decrypt result in toolbar, some ui fixes for decrypt

2015-04-26 00:33:26 +02:00

update-drawables.sh

Merge branch 'development' into linked-identities

2015-04-24 14:18:01 +02:00