Chris Collins 3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068 ... Possible fix for 2069		2016-10-31 10:21:01 -07:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon	lots	2016-03-31 09:21:08 -07:00
resources	remove mute icons	2016-10-30 09:33:02 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 16:41:39 -07:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	add custom QWebEngine request interceptor	2016-10-17 11:34:10 -07:00
interface.exe.manifest	Add Windows manifest to interface.exe	2016-03-31 14:20:19 -07:00