Virendra Singh b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 ... Conflicts: BUILD.md BUILD_WIN.md		2015-02-26 22:16:35 +05:30
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	attempt to load Courier if the requested font-family fails to load	2015-02-17 15:12:24 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305	2015-02-26 22:16:35 +05:30