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

Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear

Browse Source 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
This commit is contained in:
Lirusaito
2012-07-03 01:57:55 -04:00
parent 9c61998dac 5a685febbf
commit 4e2af85770
4 changed files with 4916 additions and 2681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llrender/llvertexbuffer.h
View File

@@ -91,7 +91,6 @@ public:
typedef std::list<Record> record_list_t;
std::vector<record_list_t> mFreeList;
std::vector<U32> mMissCount;
};
//============================================================================