diff options
author | Micael Karlberg <bmk@erlang.org> | 2011-03-17 12:24:59 +0100 |
---|---|---|
committer | Micael Karlberg <bmk@erlang.org> | 2011-03-17 12:24:59 +0100 |
commit | ffb2d69e00ef283eeb266f3082067429b6ce1127 (patch) | |
tree | 134573a992cfcc23dad544eae9c5650f97d0e208 /lib/cosEventDomain | |
parent | bf6a8c53023a284b9f2de8d13538db1ab3ff8dee (diff) | |
parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
download | otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.gz otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.tar.bz2 otp-ffb2d69e00ef283eeb266f3082067429b6ce1127.zip |
Merge branch 'dev' into bmk/inets/httpd/prevent_xss_in_error_pages/OTP-9124
Diffstat (limited to 'lib/cosEventDomain')
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml index d0aac961d7..60f26dda96 100644 --- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml +++ b/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml @@ -5,7 +5,7 @@ <header> <copyright> <year>2002</year> - <year>2007</year> + <year>2011</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml index 0720a4b930..ea605f23a0 100644 --- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml +++ b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml @@ -5,7 +5,7 @@ <header> <copyright> <year>2001</year> - <year>2007</year> + <year>2011</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> diff --git a/lib/cosEventDomain/doc/src/cosEventDomainApp.xml b/lib/cosEventDomain/doc/src/cosEventDomainApp.xml index fe8df55929..e7704b90b5 100644 --- a/lib/cosEventDomain/doc/src/cosEventDomainApp.xml +++ b/lib/cosEventDomain/doc/src/cosEventDomainApp.xml @@ -5,7 +5,7 @@ <header> <copyright> <year>2001</year> - <year>2007</year> + <year>2011</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> diff --git a/lib/cosEventDomain/test/Makefile b/lib/cosEventDomain/test/Makefile index 5b53690c6b..160c8565e8 100644 --- a/lib/cosEventDomain/test/Makefile +++ b/lib/cosEventDomain/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2001-2009. All Rights Reserved. +# Copyright Ericsson AB 2001-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/lib/cosEventDomain/test/event_domain_SUITE.erl b/lib/cosEventDomain/test/event_domain_SUITE.erl index 2793f94639..d568708429 100644 --- a/lib/cosEventDomain/test/event_domain_SUITE.erl +++ b/lib/cosEventDomain/test/event_domain_SUITE.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2010. All Rights Reserved. +%% Copyright Ericsson AB 2001-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/lib/cosEventDomain/test/generated_SUITE.erl b/lib/cosEventDomain/test/generated_SUITE.erl index 575568a7b9..e8dbafbe75 100644 --- a/lib/cosEventDomain/test/generated_SUITE.erl +++ b/lib/cosEventDomain/test/generated_SUITE.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2010. All Rights Reserved. +%% Copyright Ericsson AB 2004-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 |