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
..
control_protocol	Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows	2013-09-21 09:17:25 +01:00
frontier
generic_midi	incomplete merge of master into windows (requires upcoming changes to master to be complete)	2013-09-12 11:28:50 -04:00
mackie	incomplete merge of master into windows (requires upcoming changes to master to be complete)	2013-09-12 11:28:50 -04:00
osc
tranzport
wiimote
wscript	fix conflicts and merge with master	2013-09-16 22:11:06 -04:00