Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 11 insertions, 10 deletions

diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
index 3333c4a9aa..66746b684d 100644
--- a/erts/etc/win32/nsis/erlang20.nsi
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -7,18 +7,19 @@
 ;

 ; %CopyrightBegin%

 ;

-; Copyright Ericsson AB 2012. All Rights Reserved.

+; Copyright Ericsson AB 2012-2016. 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

-; compliance with the License. You should have received a copy of the

-; Erlang Public License along with this software. If not, it can be

-; retrieved online at http://www.erlang.org/.

+; Licensed under the Apache License, Version 2.0 (the "License");

+; you may not use this file except in compliance with the License.

+; You may obtain a copy of the License at

 ;

-; Software distributed under the License is distributed on an "AS IS"

-; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See

-; the License for the specific language governing rights and limitations

-; under the License.

+;     http://www.apache.org/licenses/LICENSE-2.0

+;

+; Unless required by applicable law or agreed to in writing, software

+; distributed under the License is distributed on an "AS IS" BASIS,

+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+; See the License for the specific language governing permissions and

+; limitations under the License.

 ;

 ; %CopyrightEnd%

 ;