aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber
diff options
context:
space:
mode:
Diffstat (limited to 'lib/orber')
-rw-r--r--lib/orber/doc/src/notes.xml13
-rw-r--r--lib/orber/include/ifr_types.hrl12
-rw-r--r--lib/orber/vsn.mk6
3 files changed, 23 insertions, 8 deletions
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index d388cc42a8..f97d7ac1fa 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -33,6 +33,19 @@
</header>
<section>
+ <title>Orber 3.6.16</title>
+ <section>
+ <title>Fixed Bugs and Malfunctions</title>
+ <list type="bulleted">
+ <item>
+ <p>Added missing trailing bracket to define in hrl-file.</p>
+ <p>Own id: OTP-8489 Aux Id:</p>
+ </item>
+ </list>
+ </section>
+ </section>
+
+ <section>
<title>Orber 3.6.15</title>
<section>
diff --git a/lib/orber/include/ifr_types.hrl b/lib/orber/include/ifr_types.hrl
index d982850e98..144ec7f8a1 100644
--- a/lib/orber/include/ifr_types.hrl
+++ b/lib/orber/include/ifr_types.hrl
@@ -1,20 +1,20 @@
%%--------------------------------------------------------------------
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
%%
@@ -54,7 +54,7 @@
id = Obj#Object_type.id,
defined_in = Obj#Object_type.defined_in,
version = Obj#Object_type.version,
- type = Obj#Object_type.type}.
+ type = Obj#Object_type.type}).
-record(exceptiondescription, {name, id, defined_in, version, type}).
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index d074bfb86c..79847451d2 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,7 +1,9 @@
-ORBER_VSN = 3.6.15
+ORBER_VSN = 3.6.16
-TICKETS = OTP-8353 \
+TICKETS = OTP-8489
+
+TICKETS_3.6.15 = OTP-8353 \
OTP-8354 \
OTP-8374 \
OTP-8409 \