Tamito Kajiyama 2676f2d58f Merged changes in the trunk up to revision 42021. ... Conflicts resolved: source/blender/blenkernel/intern/scene.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/render/intern/source/pipeline.c		2011-11-20 21:02:12 +00:00
..
buildinfo.c	remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n	2011-10-23 17:52:20 +00:00
CMakeLists.txt	Merged changes in the trunk up to revision 42021.	2011-11-20 21:02:12 +00:00
creator.c	Merged changes in the trunk up to revision 42021.	2011-11-20 21:02:12 +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