Tamito Kajiyama 2676f2d58f Merged changes in the trunk up to revision 42021. ... Conflicts resolved: source/blender/blenkernel/intern/scene.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/render/intern/source/pipeline.c		2011-11-20 21:02:12 +00:00
..
buildbot	Fix #29245: BuilderBot can't build anymore	2011-11-14 05:52:06 +00:00
cmake	hide overly picky warnings from 'pylint' for pep8 script, indentation edits.	2011-11-19 16:17:35 +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 42021.	2011-11-20 21:02:12 +00:00