diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-04 19:43:41 +0100 |
commit | 389d191448a3caf6d809552e9af63a62b9695bd3 (patch) | |
tree | f048ab23f812a5472ec17944dd2e7e9683253f5e /extern/openpgp-api-lib | |
parent | a805069c59586775fd5790c00cbd82f4dfeddcb6 (diff) | |
parent | 8f5295f2d13e895490813c0ced19cfd738e591ac (diff) | |
download | open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.gz open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.tar.bz2 open-keychain-389d191448a3caf6d809552e9af63a62b9695bd3.zip |
Merge branch 'master' into development
Diffstat (limited to 'extern/openpgp-api-lib')
m--------- | extern/openpgp-api-lib | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 0be263d5d3effd2df5f976fa4a127017268749c +Subproject e0ad1086a55eab66d963b4d5c6ca5544b454ef2 |