diff options
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 |