diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-29 13:53:18 +0200 |
| commit | 377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6 (patch) | |
| tree | c90c5941126937485b31f617dd1c31acd23fabae /extern | |
| parent | da131220aac727865b9e33e8d34743939e8acbf0 (diff) | |
| parent | f4ee71e3ef0dcacf691def97a94880b277a99496 (diff) | |
| download | open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.gz open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.tar.bz2 open-keychain-377d0f09fa051bc67ff77a2a5a5bf3ae75966ba6.zip | |
Merge branch 'ditch-appmsg'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
Diffstat (limited to 'extern')
| m--------- | extern/AppMsg | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/extern/AppMsg b/extern/AppMsg deleted file mode 160000 -Subproject 61e74741909a712db2e0d31ddffa5b7cf37c21f |