summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-30 12:45:26 -0500
committerGeenz <geenz@geenzo.com>2013-01-30 12:45:26 -0500
commit071a53c814cc11631d6f854a4211de3c7c99590e (patch)
tree98c6ef71d7c114cbbfca0ee4cf73f452737b2602 /indra/newview/CMakeLists.txt
parentaa1befd689703d9fea50399201911e0f8fca6ac6 (diff)
parent577515e93f122fe64cbf06913b8bacddee96ad22 (diff)
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rwxr-xr-xindra/newview/CMakeLists.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 3e99bd2551..85262b55a8 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -194,7 +194,6 @@ set(viewer_SOURCE_FILES
llfloaterbuyland.cpp
llfloatercamera.cpp
llfloatercolorpicker.cpp
- llfloaterdebugmaterials.cpp
llfloaterdeleteenvpreset.cpp
llfloaterdestinations.cpp
llfloaterdisplayname.cpp
@@ -773,7 +772,6 @@ set(viewer_HEADER_FILES
llfloaterbuyland.h
llfloatercamera.h
llfloatercolorpicker.h
- llfloaterdebugmaterials.h
llfloaterdeleteenvpreset.h
llfloaterdestinations.h
llfloaterdisplayname.h