diff options
author | Oz Linden <oz@lindenlab.com> | 2015-06-16 14:42:31 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-06-16 14:42:31 -0400 |
commit | fa1913ea679fd895d709da5c5782b26c7d03a40a (patch) | |
tree | 83250b59c556bfc4227d38ba12c2dac242642a2d /indra/newview/CMakeLists.txt | |
parent | e0f5ed29daa3b2803aaec60a77bde8df7df292ee (diff) | |
parent | ee05fe0e5f8d73ce4db41239fae3bfe691e54db5 (diff) |
merge changes for STORM-2109
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 13040ea423..0e3b802fc7 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1735,8 +1735,6 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxsdk.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ortp.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/libsndfile-1.dll - ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/zlib1.dll - ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxplatform.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/vivoxoal.dll ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/ca-bundle.crt ${GOOGLE_PERF_TOOLS_SOURCE} |