Andrzej Kapolka b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy ... Conflicts: interface/src/Application.h interface/src/Audio.h interface/src/Webcam.cpp		2013-07-18 18:09:57 -07:00
..
external	move shared to libraries, DRY library macro, rename libs	2013-04-12 12:38:34 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-18 18:09:57 -07:00
CMakeLists.txt	link Qt to the shared library	2013-07-16 13:01:46 -07:00