diff options
author | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-08-30 19:24:07 -0700 |
commit | 88e455a3a536bae39a0c83ae9bc43cc1252ed4c0 (patch) | |
tree | 58f4ce4cd3396c1b13b430744ce3e91ce0fa28b2 /indra/newview/CMakeLists.txt | |
parent | d48889198b9f5b39c195e237ae253339b2d89ef3 (diff) | |
parent | aaac4c7df5858a2dfc385b195446476947244dad (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4c0657b61d..b3aa6949b3 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -209,7 +209,6 @@ set(viewer_SOURCE_FILES llfloaterinspect.cpp llfloaterinventory.cpp llfloaterjoystick.cpp - llfloaterlagmeter.cpp llfloaterland.cpp llfloaterlandholdings.cpp llfloatermap.cpp @@ -784,7 +783,6 @@ set(viewer_HEADER_FILES llfloaterinspect.h llfloaterinventory.h llfloaterjoystick.h - llfloaterlagmeter.h llfloaterland.h llfloaterlandholdings.h llfloatermap.h |