diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2008-06-21 07:39:52 +0000 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2008-06-21 07:39:52 +0000 |
| commit | dc3f5ff87cfa085998bf69db6dedad45440419d3 (patch) | |
| tree | e6c54376390a110e0e91ea0139ce6bb54925ffae /indra/newview | |
| parent | af080d1c62f1a2cdc17c3870427f07ad0cf9534f (diff) | |
svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586
* QAR-687 - Test build with libs on S3
* QAR-637 Test dynamic sound throttle
* QAR-586 Test new http features branch
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 20876d630f..85cb5dd007 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -28,7 +28,6 @@ include(LScript) include(Linking) include(Mozlib) include(NDOF) -include(Smartheap) include(TemplateCheck) include(UI) include(UnixInstall) |