mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/res/layout/encrypt_content.xml		2014-07-06 02:24:34 +02:00
..
drawable
drawable-hdpi	Many changes to file ... and still incomplete	2014-07-06 02:10:35 +02:00
drawable-ldpi
drawable-mdpi	Many changes to file ... and still incomplete	2014-07-06 02:10:35 +02:00
drawable-xhdpi	Many changes to file ... and still incomplete	2014-07-06 02:10:35 +02:00
drawable-xxhdpi	Many changes to file ... and still incomplete	2014-07-06 02:10:35 +02:00
drawable-xxxhdpi
layout	Merge branch 'master' into improve-file-more	2014-07-06 02:24:34 +02:00
layout-large
menu	Many changes to file ... and still incomplete	2014-07-06 02:10:35 +02:00
raw
raw-ar
raw-cs
raw-de	Pull from transifex	2014-07-03 16:38:22 +02:00
raw-el
raw-es
raw-et
raw-fr
raw-it
raw-ja
raw-ko
raw-nl
raw-pl
raw-ru
raw-sk	Pull from transifex	2014-07-03 16:30:41 +02:00
raw-sl
raw-tr
raw-uk
raw-zh
values	Merge branch 'master' into improve-file-more	2014-07-06 02:24:34 +02:00
values-ar	Pull from transifex	2014-07-03 16:30:41 +02:00
values-cs	Pull from transifex	2014-07-03 16:30:41 +02:00
values-de	Pull from transifex	2014-07-03 16:38:22 +02:00
values-el	Pull from transifex	2014-07-03 16:30:41 +02:00
values-es	Pull from transifex	2014-07-03 16:38:22 +02:00
values-et	Pull from transifex	2014-07-03 16:30:41 +02:00
values-fr	Pull from transifex	2014-07-03 16:30:41 +02:00
values-it	Pull from transifex	2014-07-03 16:30:41 +02:00
values-ja	Pull from transifex	2014-07-03 16:30:41 +02:00
values-ko	Pull from transifex	2014-07-03 16:30:41 +02:00
values-large
values-nl	Pull from transifex	2014-07-03 16:30:41 +02:00
values-pl	Pull from transifex	2014-07-03 16:30:41 +02:00
values-ru	Pull from transifex	2014-07-03 16:30:41 +02:00
values-sk	Pull from transifex	2014-07-03 16:30:41 +02:00
values-sl	Pull from transifex	2014-07-03 16:30:41 +02:00
values-tr	Pull from transifex	2014-07-03 16:30:41 +02:00
values-uk	Pull from transifex	2014-07-03 16:30:41 +02:00
values-v11
values-zh	Pull from transifex	2014-07-03 16:30:41 +02:00
xml