Seth Alves 7c2957cfa7 merge from upstream		2017-01-31 08:57:36 -08:00
..
external
i18n
icon	lots	2016-03-31 09:21:08 -07:00
resources	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-31 05:02:07 -08:00
src	merge from upstream	2017-01-31 08:57:36 -08:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	Add steamworks to interface externals	2016-12-14 16:07:33 -08:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00