diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-05 14:44:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-05 14:44:08 -0400 |
commit | cfd80c02c317591b7a52f719e3560de8912660b5 (patch) | |
tree | 9dfbbd717b92d879060a04ca023671852bde029f /indra/newview/CMakeLists.txt | |
parent | 9f393c1d99232e622317f7f0dd28519c2af63d0d (diff) | |
parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) |
merge changes for 3.6.2-release
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rwxr-xr-x | indra/newview/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 68ed809a98..e2ae7a5a9a 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1672,6 +1672,7 @@ if (WINDOWS) ${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} ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt |