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 /lib/kernel/doc/src | |
| 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 'lib/kernel/doc/src')
| -rw-r--r-- | lib/kernel/doc/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_sctp.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_udp.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/notes.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/packages.xml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile index 78e5f7bc26..5e04bff0c1 100644 --- a/lib/kernel/doc/src/Makefile +++ b/lib/kernel/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2011. All Rights Reserved. +# Copyright Ericsson AB 1997-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/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml index e327a4f907..7ea58fffff 100644 --- a/lib/kernel/doc/src/gen_sctp.xml +++ b/lib/kernel/doc/src/gen_sctp.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2007</year><year>2011</year> + <year>2007</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml index 726dc30546..4850278a64 100644 --- a/lib/kernel/doc/src/gen_udp.xml +++ b/lib/kernel/doc/src/gen_udp.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1997</year><year>2011</year> + <year>1997</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index 94624bf512..ec2f17849f 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2004</year><year>2011</year> + <year>2004</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/kernel/doc/src/packages.xml b/lib/kernel/doc/src/packages.xml index 81b8693baa..8a82b91a90 100644 --- a/lib/kernel/doc/src/packages.xml +++ b/lib/kernel/doc/src/packages.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2009</year> + <year>2004</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> |