Brad Hefta-Gaub 84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval ... Conflicts: tests/networking/src/ResourceTests.cpp		2016-12-29 16:42:52 -08: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	Merge pull request #9259 from zfox23/FixRunningScripts	2016-12-23 15:37:24 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval	2016-12-29 16:42:52 -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