Paul Davis 7000afdc66 fix merge conflict with master		2014-01-23 13:41:20 -05:00
..
vbap_speakers.cc	VBAP backend re-work (part two): speaker positioning	2014-01-13 09:37:34 -05:00
vbap_speakers.h	VBAP backend re-work (part two): speaker positioning	2014-01-13 09:37:34 -05:00
vbap.cc	fix merge conflict with master	2014-01-23 13:41:20 -05:00
vbap.h	VBAP backend re-work (part one):	2014-01-13 09:35:57 -05:00
wscript	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