diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-18 18:16:15 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-08-18 18:16:15 +0400 |
commit | b9ce23106015e6b23a1ea8cae8049f922c732587 (patch) | |
tree | 137646c1279796c4f82e5746fd12d0ae12a75ba1 /intern/cycles/blender/addon/properties.py | |
parent | d43682d51bbe70448b328980d29c3a08cf4d4a26 (diff) |
Cycles: relicense GNU GPL source code to Apache version 2.0.
More information in this post:
http://code.blender.org/
Thanks to all contributes for giving their permission!
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 5a0b13d3714..d34795c74ca 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1,19 +1,17 @@ # -# Copyright 2011, Blender Foundation. +# Copyright 2011-2013 Blender Foundation # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. +# 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 # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# http://www.apache.org/licenses/LICENSE-2.0 # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 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 # # <pep8 compliant> |