aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-01 11:09:25 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-01 11:09:25 +0200
commite10cbc54c606563b2d06f083bca17119ca585127 (patch)
tree23c71e67b1c4a381997bdb75de476f05d7dcec5f /OpenKeychain/src/main/res/xml
parentbef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff)
parentacbf2a18617eea73924dd109e09189420d9876fe (diff)
downloadopen-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz
open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2
open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip
Merge branch 'master' into yubikey
Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Diffstat (limited to 'OpenKeychain/src/main/res/xml')
0 files changed, 0 insertions, 0 deletions