diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
| commit | 473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch) | |
| tree | 689908bd116af888e4ed7659da9b7c4af9ba4c7d /lib/orber/src | |
| parent | 7b9f93973c877af5be57add78bc0d00321ed5931 (diff) | |
| parent | 710b07ca18417976459335a8b0b81a6f6aa82699 (diff) | |
| download | otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.bz2 otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/orber/src')
| -rw-r--r-- | lib/orber/src/orber_env.erl | 2 | ||||
| -rw-r--r-- | lib/orber/src/orber_iiop_outproxy.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl index 67d31018ff..1c8a90bc81 100644 --- a/lib/orber/src/orber_env.erl +++ b/lib/orber/src/orber_env.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2011. All Rights Reserved. +%% Copyright Ericsson AB 2004-2013. 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_iiop_outproxy.erl b/lib/orber/src/orber_iiop_outproxy.erl index 9c4e603753..8319d89088 100644 --- a/lib/orber/src/orber_iiop_outproxy.erl +++ b/lib/orber/src/orber_iiop_outproxy.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2013. 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 |