resolved conflict state with HEAD r14096
[blender.git] / intern / guardedalloc /
drwxr-xr-x   ..
-rw-r--r-- 1282 CMakeLists.txt
-rw-r--r-- 4058 MEM_guardedalloc.h
-rw-r--r-- 1984 Makefile
-rw-r--r-- 201 SConscript
drwxr-xr-x - intern
drwxr-xr-x - make
drwxr-xr-x - test