svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075

[blender.git] / source / kernel / Makefile

diff --git a/source/kernel/Makefile b/source/kernel/Makefile
index 51d31f2f6ac8f730b200a8db2b4ef0189a6e721f..b71491b46d11d23919ac200ded7a2fb4e3e791f1 100644 (file)
--- a/source/kernel/Makefile
+++ b/source/kernel/Makefile
@@ -1,15 +1,12 @@
 #
 # $Id$
 #
 #
 # $Id$
 #

-# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+# ***** BEGIN GPL LICENSE BLOCK *****

 #
 # 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
 #
 # 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. The Blender
-# Foundation also sells licenses for use in proprietary software under
-# the Blender License.  See http://www.blender.org/BL/ for information
-# about this.
+# of the License, or (at your option) any later version.

 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -27,7 +24,7 @@
 #
 # Contributor(s): none yet.
 #
 #
 # Contributor(s): none yet.
 #

-# ***** END GPL/BL DUAL LICENSE BLOCK *****
+# ***** END GPL LICENSE BLOCK *****

 #
 # Make module object directory and bounce make to subdirectories.
 
 #
 # Make module object directory and bounce make to subdirectories.