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

2012-10-12 13:50:56 -04:00
parent d5c507ca6b eb5b1312bb
commit fb713226a0
20 changed files with 1533 additions and 38 deletions
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -61,7 +61,7 @@ set(cmake_SOURCE_FILES
    LLVFS.cmake
    LLWindow.cmake
    LLXML.cmake
-    LScript.cmake
+#    LScript.cmake
    Linking.cmake
    NDOF.cmake
    OPENAL.cmake