diff options
| author | Micael Karlberg <[email protected]> | 2011-03-25 17:51:06 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-25 17:51:06 +0100 |
| commit | 101a2bdd5c48f38803c274603844c69296a3b935 (patch) | |
| tree | fd9e949322565dde54ae26958b798fed4c3bc837 /bootstrap/lib/orber/include | |
| parent | b56002c163ff5f811da902129dd4b2f37edc226d (diff) | |
| parent | f0e2f0b91ac4d45a64ddac511e0eba9b6ce01e92 (diff) | |
| download | otp-101a2bdd5c48f38803c274603844c69296a3b935.tar.gz otp-101a2bdd5c48f38803c274603844c69296a3b935.tar.bz2 otp-101a2bdd5c48f38803c274603844c69296a3b935.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'bootstrap/lib/orber/include')
| -rw-r--r-- | bootstrap/lib/orber/include/Makefile | 2 | ||||
| -rw-r--r-- | bootstrap/lib/orber/include/corba.hrl | 2 | ||||
| -rw-r--r-- | bootstrap/lib/orber/include/ifr_types.hrl | 6 | ||||
| -rw-r--r-- | bootstrap/lib/orber/include/orber_pi.hrl | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap/lib/orber/include/Makefile b/bootstrap/lib/orber/include/Makefile index 219b7085e6..5aaeed1015 100644 --- a/bootstrap/lib/orber/include/Makefile +++ b/bootstrap/lib/orber/include/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1998-2009. All Rights Reserved. +# Copyright Ericsson AB 1998-2011. 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/bootstrap/lib/orber/include/corba.hrl b/bootstrap/lib/orber/include/corba.hrl index b9869855bf..526662d59d 100644 --- a/bootstrap/lib/orber/include/corba.hrl +++ b/bootstrap/lib/orber/include/corba.hrl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. 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/bootstrap/lib/orber/include/ifr_types.hrl b/bootstrap/lib/orber/include/ifr_types.hrl index 144ec7f8a1..324b32bd4f 100644 --- a/bootstrap/lib/orber/include/ifr_types.hrl +++ b/bootstrap/lib/orber/include/ifr_types.hrl @@ -1,9 +1,9 @@ %%-------------------------------------------------------------------- %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1997-2011. 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 diff --git a/bootstrap/lib/orber/include/orber_pi.hrl b/bootstrap/lib/orber/include/orber_pi.hrl index 84231758fe..69f14a5165 100644 --- a/bootstrap/lib/orber/include/orber_pi.hrl +++ b/bootstrap/lib/orber/include/orber_pi.hrl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% Copyright Ericsson AB 2000-2011. 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 |