resolved conflict state with HEAD r14096
[blender.git] / projectfiles_vc7 / gameengine / rasterizer /
drwxr-xr-x   ..
-rw-r--r-- 14195 RAS_rasterizer.vcproj
drwxr-xr-x - openglrasterizer