Tamito Kajiyama d546002476 Merged changes in the trunk up to revision 40911. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2011-10-10 21:15:11 +00:00

..

buildbot

Enabling JACK for linux buildbot.

2011-10-04 17:04:35 +00:00

cmake

remove find samplerate module, use -msse2 flag for intel c++ since its supported.

2011-10-02 17:16:28 +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 40911.

2011-10-10 21:15:11 +00:00