[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59351] branches/soc-2013-depsgraph_mt/ source/blender/editors/space_image/image_ops.c: Bad merge happened

Sergey Sharybin sergey.vfx at gmail.com
Wed Aug 21 10:32:26 CEST 2013


Revision: 59351
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59351
Author:   nazgul
Date:     2013-08-21 08:32:26 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Bad merge happened

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c	2013-08-21 08:20:33 UTC (rev 59350)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c	2013-08-21 08:32:26 UTC (rev 59351)
@@ -1,4 +1,4 @@
-=/*
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or




More information about the Bf-blender-cvs mailing list