diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-03-30 14:53:37 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-30 14:53:37 +0200 |
commit | 4ba372e01009c36a9fea40a5d8b3c8e85284d102 (patch) | |
tree | 488a6c5701f57793fb852a40733dfbe68aabe920 /lib/observer | |
parent | 9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff) | |
parent | ce4431b33d18c04f4166def737b2aed582e4426a (diff) | |
download | otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2 otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/observer')
-rw-r--r-- | lib/observer/doc/src/etop.xml | 2 | ||||
-rw-r--r-- | lib/observer/src/Makefile | 2 | ||||
-rw-r--r-- | lib/observer/src/etop.erl | 2 | ||||
-rw-r--r-- | lib/observer/src/etop_gui.erl | 2 | ||||
-rw-r--r-- | lib/observer/test/etop_SUITE.erl | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/observer/doc/src/etop.xml b/lib/observer/doc/src/etop.xml index 4eb5603549..af6bb2442b 100644 --- a/lib/observer/doc/src/etop.xml +++ b/lib/observer/doc/src/etop.xml @@ -5,7 +5,7 @@ <header> <copyright> <year>2002</year> - <year>2011</year> + <year>2012</year> <holder>Ericsson AB, All Rights Reserved</holder> </copyright> <legalnotice> diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile index 7eb2144dee..91a4c656ad 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2002-2011. All Rights Reserved. +# Copyright Ericsson AB 2002-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/observer/src/etop.erl b/lib/observer/src/etop.erl index 7ec0fedbb2..428757e5ce 100644 --- a/lib/observer/src/etop.erl +++ b/lib/observer/src/etop.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2009. All Rights Reserved. +%% Copyright Ericsson AB 2002-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/observer/src/etop_gui.erl b/lib/observer/src/etop_gui.erl index 9248d67344..f5cc0deb38 100644 --- a/lib/observer/src/etop_gui.erl +++ b/lib/observer/src/etop_gui.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2009. All Rights Reserved. +%% Copyright Ericsson AB 2002-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/observer/test/etop_SUITE.erl b/lib/observer/test/etop_SUITE.erl index a277453620..06577f82cc 100644 --- a/lib/observer/test/etop_SUITE.erl +++ b/lib/observer/test/etop_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2002-2011. All Rights Reserved. +%% Copyright Ericsson AB 2002-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 |