svn merge ^/trunk/blender -r46714:46724 --- before tile branch merge
-rw-r--r-- 61120 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 9809 GNUmakefile
-rw-r--r-- 32173 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