Zach Fox b3acdfa9d8 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into wearItButton		2017-10-19 14:37:47 -07:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Don't show 'no permission' text on wearables	2017-10-18 16:19:54 -07:00
src	don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them	2017-10-17 19:01:24 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	fix osx build	2017-10-09 17:34:43 -07:00
interface.exe.manifest