Seth Alves ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3		2016-05-20 14:38:53 -07:00
..
external
i18n
icon
resources	Remove the last of the glow level	2016-05-14 14:49:31 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3	2016-05-20 14:38:53 -07:00
ui
CMakeLists.txt	Moving GL backend out of GPU	2016-05-16 12:54:17 -07:00
interface.exe.manifest