svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
-rw-r--r-- 50789 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 8414 GNUmakefile
-rw-r--r-- 29554 SConstruct
drwxr-xr-x - build_files
drwxr-xr-x - doc
drwxr-xr-x - extern
drwxr-xr-x - intern
drwxr-xr-x - release
drwxr-xr-x - source