diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 15:57:35 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-21 15:57:35 +0100 |
| commit | 9ef2795fcd04fc228b4e3f30342f9eb79bab59fc (patch) | |
| tree | 6d6705a2dc71bdb2ad7545e768f22460971190db /OpenKeychain/src/main/res/drawable-xhdpi | |
| parent | 93c7eb72fbbf93938043566dfc1707b6714f325b (diff) | |
| parent | c7efaacc9d1abc03036625b29961b5dad2672c44 (diff) | |
| download | open-keychain-9ef2795fcd04fc228b4e3f30342f9eb79bab59fc.tar.gz open-keychain-9ef2795fcd04fc228b4e3f30342f9eb79bab59fc.tar.bz2 open-keychain-9ef2795fcd04fc228b4e3f30342f9eb79bab59fc.zip | |
Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
Diffstat (limited to 'OpenKeychain/src/main/res/drawable-xhdpi')
0 files changed, 0 insertions, 0 deletions