svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
-rw-r--r-- 45370 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 3242 GNUmakefile
-rw-r--r-- 25971 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