Cycles: svn merge -r36352:36495 https://svn.blender.org/svnroot/bf-blender/trunk...
-rw-r--r-- 40250 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 3050 GNUmakefile
-rw-r--r-- 25358 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