Brecht Van Lommel f4a9215d7c Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender ... Merging the node changes required a lot of conflict resolution, fixed the issues I could find but if you want stability you might want to wait a bit before updating.		2011-09-17 13:28:40 +00:00
..
buildinfo.c	buildinfo is now quoted from the build systems, avoids stripping quotes on startup.	2011-08-22 12:24:14 +00:00
CMakeLists.txt	Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-17 13:28:40 +00:00
creator.c	Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-09-17 13:28:40 +00:00
SConscript	Shuffle some build code around to ensure debug builds on Windows actually run too.	2011-06-08 11:53:07 +00:00