Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c

2013-01-12 02:02:53 +00:00

..

build_environment

Patch from Ejner Fergo: enhancements to install_deps.sh.

2013-01-03 15:35:46 +00:00

buildbot

Stripping and packaging shall happen inside of chroot as well

2013-01-10 09:21:12 +00:00

cmake

add error check for qtcreator&netbeans project file generators to quit early if cmake fails.

2013-01-07 14:25:26 +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 53729.

2013-01-12 02:02:53 +00:00