Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c		2012-11-19 00:41: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 52340.	2012-11-19 00:41:11 +00:00
btools.py	Buildbot: show OS X target version in buildbot zip filename.	2012-11-17 23:00:04 +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