John Emmas 300b484cf6 Merge branch 'master' into windows+cc ...

Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc

2013-10-06 11:56:03 +01:00

..

jack

Merge branch 'master' into windows+cc

2013-10-06 11:56:03 +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