resolved conflict state with HEAD r14096
[blender.git] / projectfiles_vc7 / blender / ftfont /
drwxr-xr-x   ..
-rw-r--r-- 4820 FTF_ftfont.vcproj