blender/build_files/scons
Tamito Kajiyama 53840c7db5 Merged changes in the trunk up to revision 52546.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c
2012-11-26 02:32:34 +00:00
..
config Fix 33149: LLVM caused startup crash on linux systems using Mesa llvmpipe. 2012-11-21 22:28:15 +00:00
tools Merged changes in the trunk up to revision 52340. 2012-11-19 00:41:11 +00:00