diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/CMakeLists.txt | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | 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 e64cdfe2ea..b0663c1d3b 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -171,7 +171,6 @@ set(viewer_SOURCE_FILES llfloaterpreference.cpp llfloaterproperties.cpp llfloaterregioninfo.cpp - llfloaterreleasemsg.cpp llfloaterreporter.cpp llfloaterscriptdebug.cpp llfloatersellland.cpp @@ -562,7 +561,6 @@ set(viewer_HEADER_FILES llfloaterpreference.h llfloaterproperties.h llfloaterregioninfo.h - llfloaterreleasemsg.h llfloaterreporter.h llfloaterscriptdebug.h llfloatersellland.h |