Seth Alves 70c9853189 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid		2017-02-20 12:38:13 -08:00
..
external
i18n
icon
resources	Finger paint button icon files	2017-02-18 14:21:54 +13:00
src	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
ui
CMakeLists.txt	Add steamworks to interface externals	2016-12-14 16:07:33 -08:00
interface.exe.manifest