Tamito Kajiyama 4c36a26af5 Merged changes in the trunk up to revision 45308. ... Conflicts resolved: source/blender/editors/interface/resources.c source/blender/editors/mesh/editmesh_select.c source/blender/editors/space_view3d/drawobject.c		2012-03-31 22:09:43 +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 45308.	2012-03-31 22:09:43 +00:00