Paul Davis 8c9749e42f merge with master and fix 4 conflicts by hand		2014-06-02 11:32:13 -04:00
..
control_protocol
frontier
generic_midi	merge with master and fix 4 conflicts by hand	2014-06-02 11:32:13 -04:00
mackie
osc
tranzport
wiimote
wscript