Olivier Prat 7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade		2018-03-28 11:21:07 -04: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 pull request #12574 from druiz17/remap-keybaord	2018-03-27 19:00:05 -07:00
src	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04:00
ui
CMakeLists.txt	Fix serverless content not using correct directories	2018-03-26 14:32:52 -07:00
interface.exe.manifest