blender/build_files/scons
Tamito Kajiyama dd8e836067 Merged changes in the trunk up to revision 51853.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c

This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!
2012-11-04 02:22:56 +00:00
..
config code cleanup: correct spelling 2012-09-28 06:45:20 +00:00
tools Merged changes in the trunk up to revision 51853. 2012-11-04 02:22:56 +00:00