Tamito Kajiyama a5152b7ca0 Merged changes in the trunk up to revision 46787. ... Conflicts resolved: source/blender/blenkernel/intern/idcode.c source/blender/blenloader/intern/readfile.c source/blender/editors/include/ED_anim_api.h source/blender/editors/include/UI_resources.h source/blender/makesrna/intern/rna_main.c		2012-05-19 08:40:56 +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	Fix: recent commit setting python3.2 command should not be applied to this file	2012-05-02 09:03:04 +00:00
btools.py	Enable setting of CUDA kernels to compile on command-line:	2012-05-12 21:37:01 +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