svn merge ^/trunk/blender -r40644:40720
-rw-r--r-- 47517 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 7546 GNUmakefile
-rw-r--r-- 27810 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