merge with master and fix 4 conflicts by hand
[ardour.git] / libs / backends / dummy /
drwxr-xr-x   ..
-rw-r--r-- 30387 dummy_audiobackend.cc
-rw-r--r-- 10779 dummy_audiobackend.h
-rw-r--r-- 995 wscript