Seth Alves 485df396ef Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility		2017-06-08 16:51:08 -07:00
..
external
i18n
icon
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
src	Merge pull request #10628 from jherico/qt59	2017-06-08 16:51:08 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest