diff options
| author | Micael Karlberg <[email protected]> | 2012-02-06 14:31:33 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-02-06 14:31:33 +0100 |
| commit | dd31e0c129742bdc058cef89fe0d5d763ea8b0f5 (patch) | |
| tree | 045f5f87d6dd0148a99d715a66824a46f776f236 /erts | |
| parent | 42dba5a4e328a68323c5c42ceb5197e6542d6e45 (diff) | |
| parent | 2d97f0e5f13bf22d92dbc6df18787581eb462c41 (diff) | |
| download | otp-dd31e0c129742bdc058cef89fe0d5d763ea8b0f5.tar.gz otp-dd31e0c129742bdc058cef89fe0d5d763ea8b0f5.tar.bz2 otp-dd31e0c129742bdc058cef89fe0d5d763ea8b0f5.zip | |
Merge branch 'maint'
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 d629a728c9..a420781e9f 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 |