Tamito Kajiyama efc4341ee4 Merged changes in the trunk up to revision 42556. ... Conflicts resolved: source/blender/editors/space_view3d/drawobject.c		2011-12-10 20:54:43 +00:00
..
buildbot	Buildbot configuration tweaks	2011-11-27 19:21:49 +00:00
cmake	attempt to fix defione for qtcreator project file and cycles define.	2011-12-06 04:53:16 +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 42556.	2011-12-10 20:54:43 +00:00