diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-14 10:18:13 +0100 |
| commit | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (patch) | |
| tree | 47c634a7ed0d6b4ec8ed7711bbc4cf880f7daaba /indra/newview/CMakeLists.txt | |
| parent | f480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (diff) | |
| parent | 8dd62863092b10e012db20e818e72b53fd2ed84a (diff) | |
slightly hairy merge from viewer-trunk
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b80190a1d2..e6b266e0a7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -149,7 +149,6 @@ set(viewer_SOURCE_FILES llfirstuse.cpp llflexibleobject.cpp llfloaterabout.cpp - llfloateractivespeakers.cpp llfloateranimpreview.cpp llfloaterauction.cpp llfloateravatarpicker.cpp @@ -446,6 +445,7 @@ set(viewer_SOURCE_FILES lltracker.cpp lltransientdockablefloater.cpp lltransientfloatermgr.cpp + llpanelgenerictip.cpp lluilistener.cpp lluploaddialog.cpp llurl.cpp @@ -657,7 +657,6 @@ set(viewer_HEADER_FILES llfirstuse.h llflexibleobject.h llfloaterabout.h - llfloateractivespeakers.h llfloateranimpreview.h llfloaterauction.h llfloateravatarpicker.h @@ -952,6 +951,7 @@ set(viewer_HEADER_FILES lltracker.h lltransientdockablefloater.h lltransientfloatermgr.h + llpanelgenerictip.h lluiconstants.h lluilistener.h lluploaddialog.h |