diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-04-22 01:30:50 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-04-22 01:30:50 +0400 |
commit | c9c3c41815ab0b029d36530b8684e7dada81a8bc (patch) | |
tree | 1c2b39d8d4b0e8f96fd8a9146322d3766933c9fb /intern/elbeem/CMakeLists.txt | |
parent | 006d4d1176d87ff03446665436ace2c1d31eeaf3 (diff) | |
parent | 2a7fa9e14730d44cdb2d4302481be866735d7300 (diff) |
svn merge -r 14236:14505 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/elbeem/CMakeLists.txt')
-rw-r--r-- | intern/elbeem/CMakeLists.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index c0484846c6b..45e9b95e5ff 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -1,13 +1,10 @@ # $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 -# 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 @@ -25,7 +22,7 @@ # # Contributor(s): Jacques Beaurain. # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** SET(INC ${PNG_INC} ${ZLIB_INC} ${SDL_INC}) |