Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/bmesh/intern/bmesh_construct.c source/blender/bmesh/intern/bmesh_mesh_conv.c source/blender/bmesh/intern/bmesh_mesh_conv.h source/blender/editors/interface/interface_templates.c source/blender/editors/interface/resources.c source/blender/editors/mesh/bmesh_select.c source/blender/editors/mesh/bmesh_tools.c source/blender/editors/space_view3d/drawobject.c source/blender/render/intern/source/shadeoutput.c		2012-03-25 08:20:19 +00:00
..
__init__.py	re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config	2010-07-12 18:26:35 +00:00
bcolors.py	re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config	2010-07-12 18:26:35 +00:00
Blender.py	Merged changes in the trunk up to revision 45133.	2012-03-25 08:20:19 +00:00
btools.py	XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons	2012-02-17 20:51:39 +00:00
crossmingw.py	re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config	2010-07-12 18:26:35 +00:00
mstoolkit.py	Whitespace tweaks	2011-11-10 10:34:26 +00:00