Merged changes in the trunk up to revision 55546.
[blender.git] / intern / guardedalloc / intern /
drwxr-xr-x   ..
-rw-r--r-- 23983 mallocn.c
-rw-r--r-- 7032 mmap_win.c