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 /system | |
| parent | 9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff) | |
| parent | ce4431b33d18c04f4166def737b2aed582e4426a (diff) | |
| download | otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2 otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip | |
Merge branch 'maint'
Diffstat (limited to 'system')
| -rw-r--r-- | system/COPYRIGHT | 2 | ||||
| -rw-r--r-- | system/doc/design_principles/spec_proc.xml | 2 | ||||
| -rw-r--r-- | system/doc/design_principles/sup_princ.xml | 2 | ||||
| -rw-r--r-- | system/doc/efficiency_guide/profiling.xml | 2 | ||||
| -rw-r--r-- | system/doc/reference_manual/modules.xml | 2 | ||||
| -rw-r--r-- | system/doc/tutorial/c_portdriver.xmlsrc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/system/COPYRIGHT b/system/COPYRIGHT index c6b7d8b64f..7014f080d5 100644 --- a/system/COPYRIGHT +++ b/system/COPYRIGHT @@ -5,7 +5,7 @@ This software is subject to the following Copyrights and Licenses: %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/system/doc/design_principles/spec_proc.xml b/system/doc/design_principles/spec_proc.xml index c5472c96a6..f00de71a4c 100644 --- a/system/doc/design_principles/spec_proc.xml +++ b/system/doc/design_principles/spec_proc.xml @@ -4,7 +4,7 @@ <chapter> <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/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml index 353430752c..7ad007d3fd 100644 --- a/system/doc/design_principles/sup_princ.xml +++ b/system/doc/design_principles/sup_princ.xml @@ -4,7 +4,7 @@ <chapter> <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/system/doc/efficiency_guide/profiling.xml b/system/doc/efficiency_guide/profiling.xml index 230aa3504b..cbb53c825e 100644 --- a/system/doc/efficiency_guide/profiling.xml +++ b/system/doc/efficiency_guide/profiling.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2001</year><year>2011</year> + <year>2001</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/system/doc/reference_manual/modules.xml b/system/doc/reference_manual/modules.xml index 377b2853ca..51c8157764 100644 --- a/system/doc/reference_manual/modules.xml +++ b/system/doc/reference_manual/modules.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2003</year><year>2010</year> + <year>2003</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/system/doc/tutorial/c_portdriver.xmlsrc b/system/doc/tutorial/c_portdriver.xmlsrc index e6887a25d1..09a89f792a 100644 --- a/system/doc/tutorial/c_portdriver.xmlsrc +++ b/system/doc/tutorial/c_portdriver.xmlsrc @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2000</year><year>2009</year> + <year>2000</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> |