Dominik Schürmann 9f9aa79066 Fix conflicts

2014-07-30 01:07:10 +02:00

..

anim

Create key with fragments

2014-07-30 00:50:53 +02:00

drawable

New first time screen

2014-07-16 09:49:37 +02:00

drawable-hdpi

Use new icons in other key related activites, delete old icons

2014-07-28 16:10:36 +02:00

drawable-ldpi

Use new icons in other key related activites, delete old icons

2014-07-28 16:10:36 +02:00

drawable-mdpi

Use new icons in other key related activites, delete old icons

2014-07-28 16:10:36 +02:00

drawable-xhdpi

Use new icons in other key related activites, delete old icons

2014-07-28 16:10:36 +02:00

drawable-xxhdpi

Use new icons in other key related activites, delete old icons

2014-07-28 16:10:36 +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

Fix conflicts

2014-07-30 01:07:10 +02:00

layout-large

Workaround for nullpointer bug in support lib, close #591

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

menu

Simple create key

2014-07-16 10:04:48 +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 branch 'ditch-appmsg'

2014-07-29 13:53:18 +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

introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

2014-07-27 01:22:10 +02:00

values-et

Pull from transifex

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

values-fr

introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

2014-07-27 01:22:10 +02:00

values-it

introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

2014-07-27 01:22:10 +02:00

values-ja

introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

2014-07-27 01:22:10 +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

introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

2014-07-27 01:22:10 +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

introduce EditKeyResult with transient UncachedKeyRing (half-baked!)

2014-07-27 01:22:10 +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

Added description to Setting, Changed title to suggested one

2014-07-17 20:01:53 +02:00