diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-12-18 18:17:24 -0500 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-12-18 18:17:24 -0500 | 
| commit | fae23034ad56c36b9b882932421f4c6c897bacdc (patch) | |
| tree | 0c0753a9908dd167684772f1f709e97d031aec5e | |
| parent | df5006eac948fff1104a15b8fa09f4ab53501ca2 (diff) | |
| parent | 6bea6bfa45f9f049a8d537b545d1f1969e14d56a (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 5 | 
1 files changed, 0 insertions, 5 deletions
| diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 0905ae7a73..5acbe40050 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2371,11 +2371,6 @@ include(LLAddBuildTest)  SET(viewer_TEST_SOURCE_FILES    llagentaccess.cpp    llwlparammanager.cpp -  # Not *actually* a unit test, it's an integration test. -  # Because it won't work in the new unit test iface, i've commented out -  # and notified Nat. Delete this when it's replaced! -  # + poppy & brad 2009-06-05 -  # llcapabilitylistener.cpp    )  set_source_files_properties(    ${viewer_TEST_SOURCE_FILES} | 
