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

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

Browse Source 
Conflicts:
	indra/llmessage/llregionpresenceverifier.cpp
	indra/llmessage/llregionpresenceverifier.h
This commit is contained in:
Siana Gearz
2012-11-04 02:10:31 +01:00
parent 7f0664ff82 03b3e60e23
commit 1dcfa9e0ee
135 changed files with 5345 additions and 4376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/CMakeLists.txt
View File

@@ -18,7 +18,6 @@ include(LLMath)
include(LLRender)
include(LLVFS)
include(LLWindow)
include(LLXML)
include(UI)
include_directories(
@@ -28,7 +27,6 @@ include_directories(
${LLRENDER_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
set(llwindow_SOURCE_FILES