From 716a07adde27a896b49f631d3c8dc1ba754d059c Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Thu, 30 Jun 2016 16:48:41 -0700 Subject: [PATCH] Updating submodule(s). [nomail] --- CHANGES | 8 ++++++++ VERSION | 2 +- aux/broctl | 2 +- cmake | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 3ed0aab485..511bd45e12 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,12 @@ +2.4-656 | 2016-06-30 16:48:41 -0700 + + * Fix a number of documentation building errors. (Johanna Amann) + + * Input/Logging: Make bool conversion operator explicit. (Johanna Amann) + + * Add new TLS ciphers from RFC 7905. (Johanna Amann) + 2.4-648 | 2016-06-21 18:33:22 -0700 * Fix memory leaks. Reported by Dk Jack. (Johanna Amann) diff --git a/VERSION b/VERSION index 7b1ebaceff..4a63bdc3b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-648 +2.4-656 diff --git a/aux/broctl b/aux/broctl index 214682a9d4..0b29c9faf1 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 214682a9d4b238dc55d7ecfa7c127c3aaad750d4 +Subproject commit 0b29c9faf16ea36281630cd99f982a6b36eb991c diff --git a/cmake b/cmake index b8b4604f36..accc57f1ba 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b8b4604f362aa8d4b64e589cbea499a0c041ef24 +Subproject commit accc57f1baa2b0fcc894f4a3c8f1ffc78416aeec