aboutsummaryrefslogtreecommitdiffstats
path: root/extern
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-02 17:44:50 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-02 17:44:50 +0100
commit817afffecc5454e7a185a85c4f9dcdc11fb9cd32 (patch)
tree4f54745c9b2e5037e49c4409809eb83b8dbda59b /extern
parent1f828528d37ba272a07af67babc85cc7f362f4d9 (diff)
parentdae0873f5eabadc83b4eab3dfbbc2fd0c9336974 (diff)
downloadopen-keychain-817afffecc5454e7a185a85c4f9dcdc11fb9cd32.tar.gz
open-keychain-817afffecc5454e7a185a85c4f9dcdc11fb9cd32.tar.bz2
open-keychain-817afffecc5454e7a185a85c4f9dcdc11fb9cd32.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'extern')
m---------extern/KeybaseLib0
m---------extern/StickyListHeaders0
m---------extern/SuperToasts0
m---------extern/TokenAutoComplete0
m---------extern/html-textview0
m---------extern/openkeychain-api-lib0
m---------extern/safeslinger-exchange0
m---------extern/zxing-android-integration0
m---------extern/zxing-qr-code0
9 files changed, 0 insertions, 0 deletions
diff --git a/extern/KeybaseLib b/extern/KeybaseLib
-Subproject 2b26d163df84a3d26c1c8da088ed3811b5ca6ec
+Subproject 9615d90b18d1aee4dad994aa45875adfdcfb3c3
diff --git a/extern/StickyListHeaders b/extern/StickyListHeaders
-Subproject 62cc58c12d0c09b50984caf26e5afceda887378
+Subproject 70a2ed80632938540bf07b81270384f4e5a96f9
diff --git a/extern/SuperToasts b/extern/SuperToasts
deleted file mode 160000
-Subproject 77042d633f4dd430bcc86101e31dda52433db9c
diff --git a/extern/TokenAutoComplete b/extern/TokenAutoComplete
-Subproject ca46b4261c97221ddd4db135e7838d6fa145adf
+Subproject 1d6d3882e711c14c93abf73cbcbd28b9e0e2b49
diff --git a/extern/html-textview b/extern/html-textview
-Subproject eedaa334e761273efbfc49ded2124df58c8a4d8
+Subproject 9872a73156518fd8df79dd2cd4d24750574b9ac
diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib
-Subproject 88c00479329c1aa892bef052f3f8830067c386d
+Subproject 9259075028e0906d0cb085e0c4578e23829dc3c
diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange
-Subproject 96f7c893565e3a8badd740b2035beea87d8bffb
+Subproject 7c84cb54df5b3d5c6780984e48f3e9e4cbc5128
diff --git a/extern/zxing-android-integration b/extern/zxing-android-integration
deleted file mode 160000
-Subproject e2d0064bd3171b7333af044bb30c25c85ee993d
diff --git a/extern/zxing-qr-code b/extern/zxing-qr-code
deleted file mode 160000
-Subproject 8fd0657d33d8277aadbdc1604fd3aaa2e8d4b48