Tamito Kajiyama e0df491d1e Merged changes in the trunk up to revision 43404. ...

Conflicts resolved:
source/blender/python/SConscript

2012-01-15 23:13:12 +00:00

..

buildbot

Buildbot tweaks:

2011-12-13 09:54:48 +00:00

cmake

when building blender as a py module use add_library(... MODULE on all systems, was SHARED on linux/windows.

2012-01-11 00:09:46 +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 43404.

2012-01-15 23:13:12 +00:00