summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-09-29 15:24:03 -0400
committerOz Linden <oz@lindenlab.com>2015-09-29 15:24:03 -0400
commit9757c3a7fa1c67ecbf62df4493dc68040ba0e264 (patch)
tree1d3ec613c44b1c91b2ee91546be7be0de9c72f6e /indra/newview/CMakeLists.txt
parent453dee2d21477ad534fa9982b844c40adde9b93e (diff)
parent2d52b62e67cf46222396c724d00d2de874819197 (diff)
merge changes for 3.8.4-release
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 73b60a8ffe..c4f0218ac8 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -141,7 +141,6 @@ set(viewer_SOURCE_FILES
llbreadcrumbview.cpp
llbrowsernotification.cpp
llbuycurrencyhtml.cpp
- llcallbacklist.cpp
llcallingcard.cpp
llcapabilitylistener.cpp
llcaphttpsender.cpp
@@ -762,7 +761,6 @@ set(viewer_HEADER_FILES
llbox.h
llbreadcrumbview.h
llbuycurrencyhtml.h
- llcallbacklist.h
llcallingcard.h
llcapabilitylistener.h
llcapabilityprovider.h