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_api.cc	don't ping JACK server 4 times to see if it is already up when ardour starts	2013-09-25 22:56:28 -04:00
jack_audiobackend.cc	Implement JACKAudioBackend::in_process_thread	2013-10-04 18:54:54 +10:00
jack_audiobackend.h	Move processing thread list from ARDOUR::Graph into AudioBackend implementation	2013-10-04 18:53:37 +10:00
jack_connection.cc	don't ping JACK server 4 times to see if it is already up when ardour starts	2013-09-25 22:56:28 -04:00
jack_connection.h	don't ping JACK server 4 times to see if it is already up when ardour starts	2013-09-25 22:56:28 -04:00
jack_portengine.cc	update JACK backend to use new inheritance structure for AudioBackend	2013-09-13 11:21:43 -04:00
jack_utils.cc	merge with master and fix Searchpath conflict	2013-09-12 11:40:56 -04:00
jack_utils.h
wscript	Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows	2013-09-21 09:17:25 +01:00