Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	indra/newview/llvovolume.cpp
This commit is contained in:
Lirusaito
2012-08-01 06:48:42 -04:00
parent 1c9f996248 1d1947c51a
commit e03de192c8
62 changed files with 2031 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llstartup.cpp
View File

@@ -200,7 +200,6 @@
#include "llnamelistctrl.h"
#include "llnamebox.h"
#include "llnameeditor.h"
#include "llpostprocess.h"
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
#include "llagentlanguage.h"