merge with master and fix 4 conflicts by hand
[ardour.git] / headless /
drwxr-xr-x   ..
-rwxr-xr-x 162 hardbg
-rwxr-xr-x 120 hardev
-rw-r--r-- 1776 hardev_common.sh.in
-rw-r--r-- 4458 load_session.cc
-rw-r--r-- 879 misc.cc
-rw-r--r-- 263 misc.h
-rw-r--r-- 3094 wscript