diff options
author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
---|---|---|
committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
commit | 79e0e7d2980b28660716f43d0f0518a107117e83 (patch) | |
tree | a5d506aa55aa6970b46ff1e493b6d5f9cb410470 /indra/newview/CMakeLists.txt | |
parent | e6b20328c2e25223359dede17357682b5b4e7ea1 (diff) | |
parent | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (diff) |
Merge upstream
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-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 1877db6280..a42a204b82 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -665,7 +665,6 @@ set(viewer_SOURCE_FILES llwearablelist.cpp llweb.cpp llwebprofile.cpp - llwebsharing.cpp llwind.cpp llwindowlistener.cpp llwlanimator.cpp @@ -1250,7 +1249,6 @@ set(viewer_HEADER_FILES llwearablelist.h llweb.h llwebprofile.h - llwebsharing.h llwind.h llwindowlistener.h llwlanimator.h |