fix merge conflicts from master
[ardour.git] / libs / surfaces / osc / interface.cc
2009-12-09 Paul DavisOSC is now driven by an event loop; fix up lifetime...
2009-10-30 David RobillardTrim session.h include dependency tree.
2009-10-30 David RobillardFix angle bracket project-local include paths.
2009-07-21 Carl HetheringtonFix some unused parameter warnings.
2009-01-15 Paul Davisremove "Use OSC" from options menu; make OSC optional...
2009-01-15 Paul DavisOSC becomes a control protocol object; make ardev_commo...
2006-05-18 Paul Davismoved OSC into libardour
2006-05-18 Paul Davisa) basic prototype of OSC control