diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
commit | 74d4f8af01358c0975351f90f044c03bc9c50c4c (patch) | |
tree | 72b8f043cd5787409718d1ca7be21ec32cf10657 /indra/CMakeLists.txt | |
parent | 52411f83a1e92d8449f68a6528f5b78e7c391553 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
v-r to drano merge conflicts wip
Diffstat (limited to 'indra/CMakeLists.txt')
-rw-r--r-- | indra/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 4b1bf49d07..1cebb53a07 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -66,7 +66,6 @@ if (VIEWER) add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger) add_subdirectory(${LIBS_OPEN_PREFIX}llplugin) add_subdirectory(${LIBS_OPEN_PREFIX}llui) - add_subdirectory(${LIBS_OPEN_PREFIX}llxuixml) add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components) # Legacy C++ tests. Build always, run if LL_TESTS is true. |