diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:39:49 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:39:49 -0400 |
commit | 561e0bb1a09e613e6fb41f6a31f1b182b9caa19c (patch) | |
tree | 99affc11ead78852e5f4a57594a037859766e00a /indra/newview/CMakeLists.txt | |
parent | efba897e45b5065619bbe0e1451a40b6391e503c (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 b81b4a14bd..ee0d03bab8 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1675,6 +1675,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 |