diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:02 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:58 +0100 |
| commit | f9ef1160ca764d508dafcb45fbf65f18911fff9c (patch) | |
| tree | 816564326b238848669d7a0713f48c84791cd13b /extern | |
| parent | fe32e7bff4e724d37903d07cd3b4f0287ec85879 (diff) | |
| parent | 8b4388e1a2d5cb2b7f0524c18ad3383e3375ba7b (diff) | |
| download | open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.gz open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.bz2 open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'extern')
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/snackbar | 0 | ||||
| m--------- | extern/spongycastle | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 71af808820032de9b508bcde7f283f5aa8ccf15 +Subproject 70a17dcbeb5d8de095f09a7ce756543deff0165 diff --git a/extern/snackbar b/extern/snackbar new file mode 160000 +Subproject 025ecadc592e591a96fa081265667efc0b0f0e1 diff --git a/extern/spongycastle b/extern/spongycastle -Subproject 939914d9ffd1e8cc2710de6c600c9ccfc86aa54 +Subproject 4bb0180faa920f4e8cf3d482976a34e4df982a8 |