svn merge ^/trunk/blender -r42973:42991
-rw-r--r-- 52604 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 8999 GNUmakefile
-rw-r--r-- 30917 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