diff options
author | Micael Karlberg <[email protected]> | 2011-04-01 12:07:23 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-01 12:07:23 +0200 |
commit | 2b46b0e42fe95d99619ffa343537c8468e27295c (patch) | |
tree | 9f01a4f4a6ad597299aa5a74e5e50a58e9d5812b /bootstrap/lib/orber/include/corba.hrl | |
parent | 537f010d6fe871d55c3becb02fe6ebb73dc2d55a (diff) | |
parent | 49737813349f164b35737eb3cd59491930128f58 (diff) | |
download | otp-2b46b0e42fe95d99619ffa343537c8468e27295c.tar.gz otp-2b46b0e42fe95d99619ffa343537c8468e27295c.tar.bz2 otp-2b46b0e42fe95d99619ffa343537c8468e27295c.zip |
Merge branch 'bmk/snmp/manager/deprecate_old_api/OTP-9174' into bmk/snmp/snmp420_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'bootstrap/lib/orber/include/corba.hrl')
-rw-r--r-- | bootstrap/lib/orber/include/corba.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap/lib/orber/include/corba.hrl b/bootstrap/lib/orber/include/corba.hrl index 526662d59d..b9869855bf 100644 --- a/bootstrap/lib/orber/include/corba.hrl +++ b/bootstrap/lib/orber/include/corba.hrl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2009. 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 |