Tamito Kajiyama 910f04ca63 Merged changes in the trunk up to revision 44221. ... Conflicts resolved: release/datafiles/blender_icons.png source/blender/blenkernel/intern/anim_sys.c source/blender/blenloader/intern/readfile.c		2012-02-18 11:26:11 +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 44039.	2012-02-12 00:09:48 +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