merge with master and fix 4 conflicts by hand
[ardour.git] / libs / midi++2 / MSVCmidi++ /
drwxr-xr-x   ..
-rw-r--r-- 14696 midi++.vcproj