Vincent Breitmoser 858fe47d46 Merge remote-tracking branch 'origin/master' into external-test ...

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

2014-07-15 17:39:36 +02:00

..

drawable

Converted all other buttons

2014-06-30 19:09:13 +02:00

drawable-hdpi

Converted all other buttons

2014-06-30 19:09:13 +02:00

drawable-ldpi

Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions

2014-06-18 22:30:54 +02:00

drawable-mdpi

Converted all other buttons

2014-06-30 19:09:13 +02:00

drawable-xhdpi

Converted all other buttons

2014-06-30 19:09:13 +02:00

drawable-xxhdpi

Converted all other buttons

2014-06-30 19:09:13 +02:00

drawable-xxxhdpi

Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions

2014-06-18 22:30:54 +02:00

layout

cleanup

2014-07-08 03:37:32 +02:00

layout-large

Workaround for nullpointer bug in support lib, close #591

2014-04-22 08:15:55 +02:00

menu

Hide subkeys, certs tabs in key view, checkable menu item to show/hide them

2014-06-06 22:46:39 +02:00

raw

Temporary fix for #648

2014-06-25 19:20:17 +02:00

raw-ar

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-cs

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-de

Pull from transifex

2014-07-03 16:38:22 +02:00

raw-el

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-es

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-et

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-fr

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-it

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-ja

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-ko

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-nl

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-pl

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-ru

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-sk

Pull from transifex

2014-07-03 16:30:41 +02:00

raw-sl

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-tr

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-uk

Pull from transifex

2014-05-31 20:49:56 +02:00

raw-zh

Pull from transifex

2014-05-31 20:49:56 +02:00

values

Merge remote-tracking branch 'origin/master' into external-test

2014-07-15 17:39:36 +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

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

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

ui: apply theme to tab buttons

2014-05-07 03:55:06 +02:00

values-zh

Pull from transifex

2014-07-03 16:30:41 +02:00

xml

Reference ic_launcher instead of icon

2014-06-18 23:19:54 +02:00