Patch to change license to GPL only, from GSR.

2008-01-07 19:13:47 +00:00
parent c4a2022fe1
commit 5e3cffc64a
1213 changed files with 3658 additions and 7276 deletions
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -6,7 +6,11 @@
 * 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
+<<<<<<< .mine
+ * of the License, or (at your option) any later version.
+=======
 * of the License, or (at your option) any later version. 
+>>>>>>> .r13159
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of