howard-stearns 37ab0b57a7 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration		2017-03-28 15:41:46 -07:00
..
external
i18n
icon
resources	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
src	new location protocol	2017-03-27 15:55:05 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
interface.exe.manifest