aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2012-03-30 14:53:37 +0200
committerBjörn-Egil Dahlberg <[email protected]>2012-03-30 14:53:37 +0200
commit4ba372e01009c36a9fea40a5d8b3c8e85284d102 (patch)
tree488a6c5701f57793fb852a40733dfbe68aabe920 /lib/orber/src
parent9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff)
parentce4431b33d18c04f4166def737b2aed582e4426a (diff)
downloadotp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz
otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2
otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip
Merge branch 'maint'
Diffstat (limited to 'lib/orber/src')
-rw-r--r--lib/orber/src/orber_ifr.erl2
-rw-r--r--lib/orber/src/orber_tb.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl
index 6799bc1db4..4004ffa005 100644
--- a/lib/orber/src/orber_ifr.erl
+++ b/lib/orber/src/orber_ifr.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2012. 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
diff --git a/lib/orber/src/orber_tb.erl b/lib/orber/src/orber_tb.erl
index d3e3a8497d..26a36df0e9 100644
--- a/lib/orber/src/orber_tb.erl
+++ b/lib/orber/src/orber_tb.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2012. 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