Dominik Schürmann fd55cdb08e Merge branch 'development' of github.com:open-keychain/open-keychain into development ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java		2015-02-28 00:39:18 +01:00
..
anim	show refresh key progress inline	2015-02-27 22:46:48 +01:00
drawable	Remove old Holo design resources	2015-02-26 17:37:28 +01:00
drawable-hdpi	Remove old Holo design resources	2015-02-26 17:37:28 +01:00
drawable-mdpi	Remove old Holo design resources	2015-02-26 17:37:28 +01:00
drawable-xhdpi	Remove old Holo design resources	2015-02-26 17:37:28 +01:00
drawable-xxhdpi	Remove old Holo design resources	2015-02-26 17:37:28 +01:00
drawable-xxxhdpi	Invoke NFC button	2015-02-25 20:50:34 +01:00
layout	control flow for moving the fab up with snackbar	2015-02-28 00:28:20 +01:00
layout-land	Better qr code resizing	2015-02-27 22:26:11 +01:00
menu	Fingerprint verification, design fixes for qr code card	2015-02-26 02:06:57 +01:00
raw	Style tabs, add missing drawables	2015-01-15 14:48:13 +01:00
raw-bg	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-cs	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-de	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-es	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-et	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-eu	Update from transifex	2015-02-28 00:38:53 +01:00
raw-fi	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-fr	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-is	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-it	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-ja	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-nl	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-pl	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-pt	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-ro	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-ru	Update from transifex	2015-02-28 00:38:53 +01:00
raw-sl	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-sr	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-sv	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-tr	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-uk	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-zh	Pull from transifex	2015-02-22 21:39:34 +01:00
raw-zh-rTW	Pull from transifex	2015-02-22 21:39:34 +01:00
values	Keybase header text	2015-02-27 22:40:52 +01:00
values-bg	Update from transifex	2015-02-28 00:38:53 +01:00
values-cs	Update from transifex	2015-02-28 00:38:53 +01:00
values-de	Update from transifex	2015-02-28 00:38:53 +01:00
values-es	Update from transifex	2015-02-28 00:38:53 +01:00
values-et	Update from transifex	2015-02-28 00:38:53 +01:00
values-eu	Update from transifex	2015-02-28 00:38:53 +01:00
values-fi	Update from transifex	2015-02-28 00:38:53 +01:00
values-fr	Update from transifex	2015-02-28 00:38:53 +01:00
values-is	Update from transifex	2015-02-28 00:38:53 +01:00
values-it	Update from transifex	2015-02-28 00:38:53 +01:00
values-ja	Update from transifex	2015-02-28 00:38:53 +01:00
values-large	Remove files related to old nav drawer	2015-01-29 13:36:38 +01:00
values-nl	Update from transifex	2015-02-28 00:38:53 +01:00
values-pl	Update from transifex	2015-02-28 00:38:53 +01:00
values-pt	Update from transifex	2015-02-28 00:38:53 +01:00
values-ro	Update from transifex	2015-02-28 00:38:53 +01:00
values-ru	Update from transifex	2015-02-28 00:38:53 +01:00
values-sl	Update from transifex	2015-02-28 00:38:53 +01:00
values-sr	Update from transifex	2015-02-28 00:38:53 +01:00
values-sv	Update from transifex	2015-02-28 00:38:53 +01:00
values-tr	Update from transifex	2015-02-28 00:38:53 +01:00
values-uk	Update from transifex	2015-02-28 00:38:53 +01:00
values-v21	Design fixes for header, QR Code shared element transitions	2015-02-25 19:38:13 +01:00
values-zh	Update from transifex	2015-02-28 00:38:53 +01:00
values-zh-rTW	Update from transifex	2015-02-28 00:38:53 +01:00
xml	Toolbar for settings	2015-01-14 20:18:03 +01:00