diff options
author | Dave Parks <davep@lindenlab.com> | 2012-11-08 13:05:29 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-11-08 13:05:29 -0600 |
commit | c431ddf629b7f1149c44b2063d216dd34bcd2b12 (patch) | |
tree | 7c625873abf2ad80fc25e90e073ff0fcc2e619ab /indra/newview/CMakeLists.txt | |
parent | b76b81ff811014012856f58970c1aac093507557 (diff) | |
parent | 8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--[-rwxr-xr-x] | 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 ccf4ce8d1f..767aaf7fd5 100755..100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -333,7 +333,6 @@ set(viewer_SOURCE_FILES llmarketplacenotifications.cpp llmediactrl.cpp llmediadataclient.cpp - llmemoryview.cpp llmeshrepository.cpp llmimetypes.cpp llmorphview.cpp @@ -909,7 +908,6 @@ set(viewer_HEADER_FILES llmarketplacenotifications.h llmediactrl.h llmediadataclient.h - llmemoryview.h llmeshrepository.h llmimetypes.h llmorphview.h |