Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/bmesh/intern/bmesh_construct.c source/blender/bmesh/intern/bmesh_mesh_conv.c source/blender/bmesh/intern/bmesh_mesh_conv.h source/blender/editors/interface/interface_templates.c source/blender/editors/interface/resources.c source/blender/editors/mesh/bmesh_select.c source/blender/editors/mesh/bmesh_tools.c source/blender/editors/space_view3d/drawobject.c source/blender/render/intern/source/shadeoutput.c		2012-03-25 08:20:19 +00:00
..
buildbot	Disable fancy scons output for buildbot. Should make reading build logs a bit more easier.	2012-02-26 10:47:50 +00:00
cmake	code cleanup: white space, spelling & ';;' end of lines.	2012-02-25 16:04:03 +00:00
package_spec	modify pacman file not to compile templates & presets.	2011-10-04 23:00:38 +00:00
scons	Merged changes in the trunk up to revision 45133.	2012-03-25 08:20:19 +00:00