merge with master and fix 4 conflicts by hand
[ardour.git] / libs / canvas / MSVCcanvas /
drwxr-xr-x   ..
-rw-r--r-- 18289 cairocanvas.vcproj