Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds

This commit is contained in:
Howard Stearns 2015-06-29 09:30:44 -07:00
commit 51782bd17d

View file

@ -23,7 +23,7 @@
const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 };
const float DEFAULT_BACKGROUND_ALPHA = 0.7f;
const int DEFAULT_MARGIN = 10;
const int DEFAULT_FONTSIZE = 11;
const int DEFAULT_FONTSIZE = 12;
const int DEFAULT_FONT_WEIGHT = 50;
class TextRenderer;