diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-08 11:40:56 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-08 11:40:56 -0800 |
commit | 391514744fd0f23111266b71b9052a9661c44f4e (patch) | |
tree | e2c3186056a39f40cbcb57afdf35a321d0bcaaeb | |
parent | 74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (diff) | |
parent | 25a773d79cc8b2e00f6769abe0717ac9b2325cd4 (diff) |
merge.
-rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 1 | ||||
-rw-r--r-- | install.xml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 5a142f23c9..faf9da8b14 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -231,7 +231,6 @@ elseif(LINUX) libstacktrace.so libtcmalloc.so libuuid.so.1 - libz.so libssl.so.0.9.7 ) diff --git a/install.xml b/install.xml index 566bc41ccc..cac3d52c23 100644 --- a/install.xml +++ b/install.xml @@ -1539,9 +1539,9 @@ anguage Infrstructure (CLI) international standard</string> <key>linux</key> <map> <key>md5sum</key> - <string>1804b54034ef7f82832506a44acb06b8</string> + <string>26fe88213c213dc6153690ab142c25ca</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux-20090603.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3dfsg-linux-20091208.tar.bz2</uri> </map> <key>linux64</key> <map> |