David Kelly 962d1fc81d Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet		2017-08-30 15:30:29 -07:00
..
external
i18n
icon
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
src	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
ui
CMakeLists.txt	fix for 'C1128: number of sections exceeded object file format limit'	2017-08-23 00:24:09 +03:00
interface.exe.manifest