svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full
[blender.git] / doc / build_systems /
drwxr-xr-x   ..
-rw-r--r-- 6111 cmake.txt
-rw-r--r-- 8755 scons-dev.txt
-rw-r--r-- 9301 scons.txt