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
..
audio	couple more type squishes	2013-07-11 11:11:39 -07:00
avatars	Code review issues addressed.	2013-07-17 16:09:24 -07:00
shared	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-18 18:09:57 -07:00
voxels	fixed crash	2013-07-18 11:25:01 -07:00