svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22704:22717
[blender.git] / source /
drwxr-xr-x   ..
-rw-r--r-- 1140 CMakeLists.txt
-rw-r--r-- 23864 Makefile
-rw-r--r-- 291 SConscript
drwxr-xr-x - blender
drwxr-xr-x - creator
drwxr-xr-x - darwin
drwxr-xr-x - gameengine
drwxr-xr-x - icons
drwxr-xr-x - kernel
-rw-r--r-- 11505 nan_compile.mk
-rw-r--r-- 21582 nan_definitions.mk
-rw-r--r-- 4918 nan_link.mk
-rw-r--r-- 2240 nan_subdirs.mk
-rw-r--r-- 5163 nan_warn.mk