John Emmas 19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows ... Conflicts (hopefully resolved): gtk2_ardour/marker.cc gtk2_ardour/midi_region_view.h gtk2_ardour/region_gain_line.h gtk2_ardour/utils.cc gtk2_ardour/video_image_frame.cc gtk2_ardour/wscript libs/backends/jack/wscript		2013-09-21 09:17:25 +01:00
..
jack_api.cc	use visibility control on JACK audio backend, so that we can import this change into windows branch	2013-09-13 12:32:50 -04:00
jack_audiobackend.cc	substantive changes to allow the audio/MIDI setup dialog to change settings as intended	2013-09-17 21:09:13 -04:00
jack_audiobackend.h	substantive changes to allow the audio/MIDI setup dialog to change settings as intended	2013-09-17 21:09:13 -04:00
jack_connection.cc	substantive changes to allow the audio/MIDI setup dialog to change settings as intended	2013-09-17 21:09:13 -04:00
jack_connection.h	substantive changes to allow the audio/MIDI setup dialog to change settings as intended	2013-09-17 21:09:13 -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	always add a timeout value of 200msec to jack, just like qjackctl does.	2013-09-11 21:00:21 -04:00
wscript	Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows	2013-09-21 09:17:25 +01:00