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/editors/include/BIF_glutil.h | |
| parent | c4a2022fe11a51a48f686528f8db065139c6fede (diff) | |
Patch to change license to GPL only, from GSR.
Diffstat (limited to 'source/blender/editors/include/BIF_glutil.h')
| -rw-r--r-- | source/blender/editors/include/BIF_glutil.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index 1c8a7acde89..fcc5b6377e8 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -22,7 +22,13 @@ * * Contributor(s): Blender Foundation 2002-2008 * +<<<<<<< .mine + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** +======= * ***** END GPL LICENSE BLOCK ***** +>>>>>>> .r13159 */ #ifndef BIF_GLUTIL_H |