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 | |
| 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')
| m--------- | extern/KeybaseLib | 0 | ||||
| m--------- | extern/StickyListHeaders | 0 | ||||
| m--------- | extern/SuperToasts | 0 | ||||
| m--------- | extern/TokenAutoComplete | 0 | ||||
| m--------- | extern/minidns | 0 | ||||
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/openpgp-api-lib | 0 | ||||
| m--------- | extern/zxing-android-integration | 0 | ||||
| m--------- | extern/zxing-qr-code | 0 |
9 files changed, 0 insertions, 0 deletions
diff --git a/extern/KeybaseLib b/extern/KeybaseLib -Subproject 7f4980f0789d7bb3c2124080f32b3bec703c576 +Subproject 2b26d163df84a3d26c1c8da088ed3811b5ca6ec diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders -Subproject 911f8ddfd007ce65aededae7e7b79e5a8d903a4 +Subproject 62cc58c12d0c09b50984caf26e5afceda887378 diff --git a/extern/SuperToasts b/extern/SuperToasts -Subproject 8578cfe6917cf16a9f123c1964e4bbff2a15be5 +Subproject 77042d633f4dd430bcc86101e31dda52433db9c diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete -Subproject 000fa65390b98106201a0ffaad76c5d85a35396 +Subproject ca46b4261c97221ddd4db135e7838d6fa145adf diff --git a/extern/minidns b/extern/minidns -Subproject 118fefcaaa44a7f31f5c18fa7e477f1665f654b +Subproject f3a19080f15e220fbacab5045c1f15fd12513b3 diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 57e58e7f7f51c4eecd7ee4b0f22c856485a243b +Subproject 0cdbf32231739eac47999be71d6d01fc2837518 diff --git a/extern/openpgp-api-lib b/extern/openpgp-api-lib -Subproject 0be263d5d3effd2df5f976fa4a127017268749c +Subproject e0ad1086a55eab66d963b4d5c6ca5544b454ef2 diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration -Subproject 1d787845663fd232f98f5e8e0923733c1a188f2 +Subproject e2d0064bd3171b7333af044bb30c25c85ee993d diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code -Subproject 9ef2f3b66ea7cc283e865ec39434d023a18d17f +Subproject 8fd0657d33d8277aadbdc1604fd3aaa2e8d4b48 |