Merge from trunk -r 24247:24313, -r 24313:24390.
[blender.git] / intern / bsp / extern /
drwxr-xr-x   ..
-rw-r--r-- 10594 CSG_BooleanOps.h