Paul Davis e5888d3983 merge with master and fix 2 conflicts		2013-10-16 22:06:56 -04:00
..
control_protocol	initial commit of hand merging, plus getting "ancient" waf script to work correctly	2013-04-04 00:32:52 -04:00
frontier
generic_midi	move MidiPortManager from AudioEngine to Session	2013-09-05 13:22:34 -04:00
mackie	reduce default height of mackie control GUI, as per #5713	2013-10-15 13:28:01 -04:00
osc	fix compiler warnings.	2013-08-08 15:26:16 -04:00
tranzport
wiimote
wscript	fix language issue	2013-09-16 10:07:52 -04:00