[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13261] branches/blender2.5/blender/source /blender: * rearrange screen level drawing code a bit in preparation for tests.

[Michael Fox]

On Wed, 2008-01-16 at 20:49 +0100, Nathan Letwory wrote:

> 
> Modified: branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h
> ===================================================================
> --- branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h	2008-01-16 14:28:20 UTC (rev 13260)
> +++ branches/blender2.5/blender/source/blender/editors/include/BIF_glutil.h	2008-01-16 19:49:34 UTC (rev 13261)
> @@ -22,13 +22,7 @@
>   *
>   * Contributor(s): Blender Foundation 2002-2008
>   *
> -<<<<<<< .mine
> - * Contributor(s): none yet.
> - *
>   * ***** END GPL LICENSE BLOCK *****
> -=======
> - * ***** END GPL LICENSE BLOCK *****
> ->>>>>>> .r13159
>   */
errr this is bad and will break compilie
-- 
Michael Fox <mfoxdogg at gmail.com>