Seth Alves 5ab82cd7c8 Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars		2016-07-02 15:11:59 -07:00
..
external
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	Merge pull request #8171 from jherico/qml_fixes	2016-07-01 16:20:36 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars	2016-07-02 15:11:59 -07:00
ui
CMakeLists.txt	rework plugins to not depend on PluginContainer unless they want to	2016-06-21 12:07:05 -07:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00