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/diameter/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/diameter/doc/src')
| -rw-r--r-- | lib/diameter/doc/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/diameter/doc/src/diameter_dict.xml | 2 | ||||
| -rw-r--r-- | lib/diameter/doc/src/diameter_transport.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile index cdf63e7fb6..59ca660797 100644 --- a/lib/diameter/doc/src/Makefile +++ b/lib/diameter/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2011. All Rights Reserved. +# Copyright Ericsson AB 2010-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/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml index 26d6ad4e56..98adebf145 100644 --- a/lib/diameter/doc/src/diameter_dict.xml +++ b/lib/diameter/doc/src/diameter_dict.xml @@ -5,7 +5,7 @@ <header> <copyright> -<year>2011</year> +<year>2011</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/lib/diameter/doc/src/diameter_transport.xml b/lib/diameter/doc/src/diameter_transport.xml index 1bd45d9ce8..9ab750e560 100644 --- a/lib/diameter/doc/src/diameter_transport.xml +++ b/lib/diameter/doc/src/diameter_transport.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> -<year>2011</year> +<year>2011</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> |