atlante45 c96e01ef51 Fixed merge conflict		2013-06-09 23:15:49 +02:00
..
external	link PortAudio as a static library instead of compiling as dependency	2013-05-14 11:22:34 -07:00
resources	Merge branch 'master' of https://github.com/worklist/hifi into voxeltars	2013-06-04 11:00:59 -07:00
src	Fixed merge conflict	2013-06-09 23:15:49 +02:00
CMakeLists.txt	use system flag for external library includes	2013-06-07 11:34:01 -07:00
interface.icns	update to newer interface icon	2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in