diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-08-31 14:59:43 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-08-31 14:59:43 +0200 |
| commit | 91f8f903ae866d06332a6f2ef968b419339e6003 (patch) | |
| tree | 6ab98b4cd60c4b73be8452619bae86cf90a79723 /system/doc/top | |
| parent | 87c5ea0577267fd17bcc572ab81bdac030dd8332 (diff) | |
| parent | 2d03ab7ffde828d3b56f8b7738fd0c00d0f5b630 (diff) | |
| download | otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.gz otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.bz2 otp-91f8f903ae866d06332a6f2ef968b419339e6003.zip | |
Merge branch 'maint'
Conflicts:
lib/diameter/autoconf/vxworks/sed.general
xcomp/README.md
Diffstat (limited to 'system/doc/top')
| -rw-r--r-- | system/doc/top/Makefile | 2 | ||||
| -rw-r--r-- | system/doc/top/templates/index.html.src | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile index bbdb4d7055..9b305eb13b 100644 --- a/system/doc/top/Makefile +++ b/system/doc/top/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1999-2011. All Rights Reserved. +# Copyright Ericsson AB 1999-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/system/doc/top/templates/index.html.src b/system/doc/top/templates/index.html.src index a3cbc8bc69..2b90c03bbc 100644 --- a/system/doc/top/templates/index.html.src +++ b/system/doc/top/templates/index.html.src @@ -2,7 +2,7 @@ <!-- %CopyrightBegin% -Copyright Ericsson AB 2009-2010. All Rights Reserved. +Copyright Ericsson AB 2009-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 |