[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57125] trunk/blender: svn merge ^/tags/ blender-2.67b-release/blender -c57122
Campbell Barton
ideasman42 at gmail.com
Wed May 29 20:18:11 CEST 2013
Revision: 57125
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57125
Author: campbellbarton
Date: 2013-05-29 18:18:11 +0000 (Wed, 29 May 2013)
Log Message:
-----------
svn merge ^/tags/blender-2.67b-release/blender -c57122
Modified Paths:
--------------
trunk/blender/release/datafiles/splash.png
trunk/blender/source/blender/blenkernel/BKE_blender.h
Property Changed:
----------------
trunk/blender/
Property changes on: trunk/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
Modified: trunk/blender/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-05-29 17:53:54 UTC (rev 57124)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-05-29 18:18:11 UTC (rev 57125)
@@ -50,7 +50,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR a
+#define BLENDER_VERSION_CHAR b
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
More information about the Bf-blender-cvs
mailing list