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
..
src	Working on transmitting and receiving the face video.	2013-07-17 18:02:27 -07:00
CMakeLists.txt	switch calls to printLog to QDebug	2013-07-16 11:07:22 -07:00