Brad Davis 0af6b3b749 Merge pull request #10719 from ctrlaltdavid/21397 ... Ensure desktop dialogs' title bars are visible		2017-06-16 17:35:18 -07:00
..
external
i18n
icon
resources	Merge pull request #10719 from ctrlaltdavid/21397	2017-06-16 17:35:18 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04: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