resolved conflict state with HEAD r14096
[blender.git] / source / blender / blenkernel / bad_level_call_stubs /
drwxr-xr-x   ..
-rw-r--r-- 1439 CMakeLists.txt
-rw-r--r-- 1557 Makefile
-rw-r--r-- 396 SConscript
-rw-r--r-- 12496 stubs.c