Brad Hefta-Gaub 29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 ... CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361		2015-03-03 11:17:31 -08:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	Merge pull request #4369 from ctrlaltdavid/20370	2015-03-03 11:17:31 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305	2015-02-26 22:16:35 +05:30