From 5e3cffc64a652c64bf8676bac3c0b93dd7d738fc Mon Sep 17 00:00:00 2001 From: Chris Want Date: Mon, 7 Jan 2008 19:13:47 +0000 Subject: Patch to change license to GPL only, from GSR. --- source/blender/python/BPY_extern.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/python/BPY_extern.h') diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index dda8b464680..8da2f126de0 100644 --- 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 -- cgit v1.2.3