merge with master and fix 4 conflicts by hand
[ardour.git] / libs / backends / MSVCbackends /
drwxr-xr-x   ..
-rw-r--r-- 17716 jack_backend.vcproj
-rw-r--r-- 23113 waves_backend.vcproj