John Emmas e466ce40ad Merge branch 'master' into windows+cc ... Conflicts (hopefully resolved): gtk2_ardour/ardour_ui.cc		2013-10-14 19:31:22 +01:00
..
jack	Merge branch 'master' into windows+cc	2013-10-14 19:31:22 +01:00
wscript	move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work)	2013-09-07 11:03:57 -04:00