merge with master and fix 4 conflicts by hand
[ardour.git] / gtk2_ardour / msvc /
drwxr-xr-x   ..
-rw-r--r-- 3632 winmain.cc