svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full
-rw-r--r-- 46763 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 8742 GNUmakefile
-rw-r--r-- 26797 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