Sam Gateau 9a1e1a001a Merge branch 'master' of github.com:highfidelity/hifi into toulouse		2019-08-13 10:00:59 -07:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external
i18n
icon	- updated console+server icons, installer+uninstaller graphics, and console notification icon	2019-04-26 14:50:18 -07:00
resources	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation	2019-08-09 17:28:46 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into toulouse	2019-08-13 10:00:59 -07:00
ui	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
CMakeLists.txt	Revert "Merge pull request #15944 from danteruiz/add-signing"	2019-07-23 09:38:32 -07:00
interface.exe.manifest