resolved conflict state with HEAD r14096
[blender.git] / intern / make /
drwxr-xr-x   ..
drwxr-xr-x - msvc_6_0
drwxr-xr-x - msvc_7_0