Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2013-11-19 04:44:55 +01:00
parent f21bec1ab9 8aa4d0fd27
commit 594eacb480
14 changed files with 313 additions and 270 deletions
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -60,6 +60,7 @@
 #include "llaudioengine.h"		// mute on minimize
 #include "llassetstorage.h"
 #include "llfontgl.h"
+#include "llfontfreetype.h"
 #include "llmousehandler.h"
 #include "llrect.h"
 #include "llsky.h"