Tamito Kajiyama ac9ec06ec1 Merged changes in the trunk up to revision 54421. ... Conflicts resolved: release/datafiles/startup.blend release/scripts/startup/bl_ui/properties_render.py source/blender/SConscript source/blender/blenloader/intern/readfile.c		2013-02-10 10:17:59 +00:00
..
build_environment	Patch from Ejner Fergo: enhancements to install_deps.sh.	2013-01-03 15:35:46 +00:00
buildbot	code cleanup:	2013-01-15 23:17:45 +00:00
cmake	add missing bullet header to cmake, quiet reports from 'make test_cmake'	2013-02-06 04:16:28 +00:00
package_spec	Add datafiles/locale/languages to blender.spec.in for CPack	2012-12-28 23:30:34 +00:00
scons	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +00:00