John Emmas 75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc		2013-10-16 15:55:59 +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	Merge remote-tracking branch 'remotes/origin/master' into windows+cc	2013-10-16 15:55:59 +01:00
osc	use visibility macros to control visibility in control surface DLL/DSO's	2013-09-03 08:33:51 -04:00
tranzport	use visibility macros to control visibility in control surface DLL/DSO's	2013-09-03 08:33:51 -04:00
wiimote	use visibility macros to control visibility in control surface DLL/DSO's	2013-09-03 08:33:51 -04:00
wscript	fix conflicts and merge with master	2013-09-16 22:11:06 -04:00