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

2012-11-12 04:12:57 +01:00
parent c3d76669ca eb5b1312bb
commit 562acd6e2c
35 changed files with 1935 additions and 225 deletions
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -60,7 +60,7 @@ set(cmake_SOURCE_FILES
    LLVFS.cmake
    LLWindow.cmake
    LLXML.cmake
-    LScript.cmake
+#    LScript.cmake
    Linking.cmake
    NDOF.cmake
    OPENAL.cmake