diff options
author | Micael Karlberg <bmk@erlang.org> | 2012-02-06 14:30:20 +0100 |
---|---|---|
committer | Micael Karlberg <bmk@erlang.org> | 2012-02-06 14:30:20 +0100 |
commit | 2d97f0e5f13bf22d92dbc6df18787581eb462c41 (patch) | |
tree | bac265730b859dc87f0467464be4cd142098c4ef /erts | |
parent | ab2ba6f1b0713fbe5c78f67aeefb73ffc006e995 (diff) | |
parent | 0c9547c384ba9d299d4a73bdf2a514c2b47128cd (diff) | |
download | erlang-2d97f0e5f13bf22d92dbc6df18787581eb462c41.tar.gz |
Merge branch 'maint-r15' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts')
-rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 053c0e9f52..bbf77b1a68 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -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 |