Cycles: svn merge -r41205:41225 ^/trunk/blender
-rw-r--r-- 51386 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 8686 GNUmakefile
-rw-r--r-- 26742 SConstruct
drwxr-xr-x - build_files
drwxr-xr-x - doc
drwxr-xr-x - extern
drwxr-xr-x - intern
drwxr-xr-x - po
drwxr-xr-x - release
drwxr-xr-x - source