samcake 5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin		2016-07-12 09:19:28 -07:00
..
external
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	Merge pull request #6959 from Triplelexx/20769	2016-07-11 14:24:52 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into skin	2016-07-12 09:19:28 -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