aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-04-03 11:56:48 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-04-03 11:56:48 +0200
commitcd82636ecd8a9dee9f9abb353ff3ff256adf74f1 (patch)
tree6508f8478940ff23e33d202abcb7fbbf790aef60 /lib/orber
parent6c1ba432eac3aee730da9ae6fc484b5806a7dfd2 (diff)
parentcfea5eea406ba3af96588ff458e55de9a149d9c5 (diff)
downloadotp-cd82636ecd8a9dee9f9abb353ff3ff256adf74f1.tar.gz
otp-cd82636ecd8a9dee9f9abb353ff3ff256adf74f1.tar.bz2
otp-cd82636ecd8a9dee9f9abb353ff3ff256adf74f1.zip
Merge commit 'OTP_R15B01'
Diffstat (limited to 'lib/orber')
-rw-r--r--lib/orber/doc/src/notes.xml24
-rw-r--r--lib/orber/vsn.mk2
2 files changed, 24 insertions, 2 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 35ee5e35dd..72cd808d20 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -32,7 +32,29 @@
<file>notes.xml</file>
</header>
- <section><title>Orber 3.6.23</title>
+ <section><title>Orber 3.6.24</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix number of arguments in orber dbg printout</p>
+ <p>
+ Own Id: OTP-9887</p>
+ </item>
+ <item>
+ <p> The descriptions of <c>ssl_server_options</c> and
+ <c>ssl_client_options</c> are corrected.<br/> Seq. Id:
+ seq12018 </p>
+ <p>
+ Own Id: OTP-9966 Aux Id: OTP-9773 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Orber 3.6.23</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index 0eac1e1410..f891440600 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,3 +1,3 @@
-ORBER_VSN = 3.6.23
+ORBER_VSN = 3.6.24