Seth Alves 92966377fb Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire		2017-05-04 19:05:57 -07:00
..
external
i18n
icon
resources	Merge pull request #10374 from howard-stearns/notification-circumstances	2017-05-04 16:18:58 -07:00
src	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest