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/cmake/CMakeLists.txt | |
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/cmake/CMakeLists.txt')
-rw-r--r-- | indra/cmake/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 9cc34ea159..f0bb241961 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -63,7 +63,6 @@ set(cmake_SOURCE_FILES PNG.cmake Python.cmake QuickTime.cmake - Smartheap.cmake TemplateCheck.cmake UI.cmake UnixInstall.cmake |