Seth Alves 9ab2a61a4b Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire		2017-05-04 10:04:18 -07:00
..
external
i18n
icon
resources	Fix some typos noticed in passing	2017-05-04 16:56:18 +12:00
src	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
interface.exe.manifest