Seth Alves 960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire		2017-05-04 16:42:57 -07:00
..
src	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
CMakeLists.txt	Avatar has no dependency on audio or recording anymore	2015-11-17 17:13:53 -08:00