Paul Davis 37b1f5017e merge with master		2014-01-14 21:13:21 -05:00
..
control_protocol	move -fvisibility=hidden to the top of the source tree, and remove its internal use; use libtimecode as a shared lib again	2014-01-12 15:40:47 -05:00
frontier	Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there	2014-01-10 16:07:57 -05:00
generic_midi	Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there	2014-01-10 16:07:57 -05:00
mackie	merge with master	2014-01-14 21:13:21 -05:00
osc	Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there	2014-01-10 16:07:57 -05:00
tranzport	Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there	2014-01-10 16:07:57 -05:00
wiimote	Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there	2014-01-10 16:07:57 -05:00
wscript	fix conflicts and merge with master	2013-09-16 22:11:06 -04:00