samcake 2dcedf9f39 cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation		2018-01-30 12:52:05 -08:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixSortingAgain	2018-01-25 15:04:28 -08:00
src	cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation	2018-01-30 12:52:05 -08:00
ui
CMakeLists.txt	Fix font loading from non-QRC html	2018-01-22 16:48:00 -08:00
interface.exe.manifest