Tamito Kajiyama 910f04ca63 Merged changes in the trunk up to revision 44221. ... Conflicts resolved: release/datafiles/blender_icons.png source/blender/blenkernel/intern/anim_sys.c source/blender/blenloader/intern/readfile.c		2012-02-18 11:26:11 +00:00
..
buildbot	Buildbot: WITH_BF_CYCLES_CUDA_BINARIES should be set for packing stage too.	2012-02-14 17:03:27 +00:00
cmake	patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes	2012-02-17 19:21:47 +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 44221.	2012-02-18 11:26:11 +00:00