Tamito Kajiyama 15ed834343 Merged changes in the trunk up to revision 51718. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/makesrna/intern/rna_scene.c release/datafiles/startup.blend		2012-10-29 01:09:12 +00:00
..
buildbot	Buildbot: keem sm_13 disabled for new buildbot too	2012-10-28 17:04:32 +00:00
cmake	remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used.	2012-10-22 02:39:26 +00:00
package_spec	Have CPack rpm builder install the colorspace folder too	2012-10-04 15:14:15 +00:00
scons	Merged changes in the trunk up to revision 51718.	2012-10-29 01:09:12 +00:00