summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <egil@erlang.org>2012-08-31 14:59:43 +0200
committerBjörn-Egil Dahlberg <egil@erlang.org>2012-08-31 14:59:43 +0200
commit91f8f903ae866d06332a6f2ef968b419339e6003 (patch)
tree6ab98b4cd60c4b73be8452619bae86cf90a79723 /README.md
parent87c5ea0577267fd17bcc572ab81bdac030dd8332 (diff)
parent2d03ab7ffde828d3b56f8b7738fd0c00d0f5b630 (diff)
downloaderlang-91f8f903ae866d06332a6f2ef968b419339e6003.tar.gz
Merge branch 'maint'
Conflicts: lib/diameter/autoconf/vxworks/sed.general xcomp/README.md
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 62c7b0f2be..1bcf14e760 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ Copyright and License
> %CopyrightBegin%
>
-> Copyright Ericsson AB 2010. 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