diff options
| author | Chris Want <cwant@ualberta.ca> | 2008-01-07 22:13:47 +0300 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2008-01-07 22:13:47 +0300 |
| commit | 5e3cffc64a652c64bf8676bac3c0b93dd7d738fc (patch) | |
| tree | 490272259af401f0924c4c24fd639b31e0e8a61b /source/blender/python/BPY_extern.h | |
| parent | c4a2022fe11a51a48f686528f8db065139c6fede (diff) | |
Patch to change license to GPL only, from GSR.
Diffstat (limited to 'source/blender/python/BPY_extern.h')
| -rw-r--r-- | source/blender/python/BPY_extern.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 |