Tamito Kajiyama b6a9a953bc Merged changes in the trunk up to revision 47056. ... Conflicts resolved: source/blender/bmesh/bmesh_class.h source/blender/bmesh/intern/bmesh_construct.c source/blender/editors/interface/resources.c source/blender/render/intern/source/convertblender.c		2012-05-26 22:22:45 +00:00
..
buildinfo.c	style cleanup: mostly whitespace in rna	2012-05-12 11:01:29 +00:00
CMakeLists.txt	Merged changes in the trunk up to revision 47056.	2012-05-26 22:22:45 +00:00
creator.c	Merged changes in the trunk up to revision 47056.	2012-05-26 22:22:45 +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