diff options
author | Bruce Yinhe <bruce@erlang.org> | 2015-06-22 15:42:56 +0200 |
---|---|---|
committer | Bruce Yinhe <bruce@erlang.org> | 2015-06-22 15:44:54 +0200 |
commit | 8f63667b316cdff10e666b8f5b0b6a92bd722e5a (patch) | |
tree | 0c4497adc35cdcffc411e5168e2b052bf495ca8d /erts/emulator/hipe/hipe_ops.tab | |
parent | 35b20eb172a077b363af37d27c320b759d42869d (diff) | |
parent | 6bed12016e0d300b8afc65b5aa8f282dcaa6525e (diff) | |
download | otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.tar.gz otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.tar.bz2 otp-8f63667b316cdff10e666b8f5b0b6a92bd722e5a.zip |
Merge branch 'bruce/change-license'
OTP-12845
* bruce/change-license:
fix errors caused by changed line numbers
Change license text to APLv2
Diffstat (limited to 'erts/emulator/hipe/hipe_ops.tab')
-rw-r--r-- | erts/emulator/hipe/hipe_ops.tab | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/erts/emulator/hipe/hipe_ops.tab b/erts/emulator/hipe/hipe_ops.tab index 50c3a4ae2f..d021c72ac9 100644 --- a/erts/emulator/hipe/hipe_ops.tab +++ b/erts/emulator/hipe/hipe_ops.tab @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 2001-2011. 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% # |