Skip to content
Snippets Groups Projects
Commit 0ebcdce8 authored by prep's avatar prep
Browse files

WIP: merge fixes

parent 34fe6ad5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/lloutputmonitorctrl.h
+ 1
− 1
View file @ 0ebcdce8
......@@ -31,7 +31,7 @@
#include "../llui/llview.h"
#include "llmutelist.h"
#include "llspeakingindicatormanager.h"
#include "../llui/lluiimage.h"
//#include "../llui/lluiimage.h"
class LLTextBox;
class LLUICtrlFactory;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment