ardour/libs/surfaces/control_protocol
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 'libs/surfaces' - Add an additional visibility specifier (ARDOURCP_API as well as ARDOURSURFACE_API) 2013-09-04 15:54:35 +01:00
basic_ui.cc fix up Location::first_location_(after|before) to do the right thing when marks + ranges are interleaved (functions renamed) 2013-01-17 13:19:16 +00:00
control_protocol.cc MCP: ctrl-select toggle selections status, analogous to GUI op 2012-04-26 22:10:32 +00:00
wscript Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows 2013-09-21 09:17:25 +01:00