Tamito Kajiyama 16702c1729 Merged changes in the trunk up to revision 41225. ... Conflicts resolved: source/blender/render/intern/source/pipeline.c		2011-10-29 15:46:14 +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	Merged changes in the trunk up to revision 41225.	2011-10-29 15:46:14 +00:00
creator.c	Merged changes in the trunk up to revision 41225.	2011-10-29 15:46:14 +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