[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37349] branches/soc-2011-salad/source/ blender/blenkernel/BKE_blender.h: fileversion fix

Jason Wilkins Jason.A.Wilkins at gmail.com
Fri Jun 10 01:11:14 CEST 2011


Revision: 37349
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37349
Author:   jwilkins
Date:     2011-06-09 23:11:12 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
fileversion fix

I had bumped the fileversion in Onion for testing purposes. Setting it back to 1. This should cause a merge conflict next time I merge (hopefully not with anybody else though *fingers crossed*) and I will be reminded to make sure I don't change it again here.

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h

Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h	2011-06-09 22:57:15 UTC (rev 37348)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h	2011-06-09 23:11:12 UTC (rev 37349)
@@ -44,7 +44,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION			257
-#define BLENDER_SUBVERSION		2
+#define BLENDER_SUBVERSION		1
 
 #define BLENDER_MINVERSION		250
 #define BLENDER_MINSUBVERSION	0




More information about the Bf-blender-cvs mailing list