summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-08 16:07:27 -0800
committerPalmer <palmer@lindenlab.com>2009-12-08 16:07:27 -0800
commitfadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (patch)
treee9cd888b4816ef81bbc2de14441712a9f116b335
parent7a7eced4a619d98d808abba3f0bf951bcf4cd95a (diff)
parent391514744fd0f23111266b71b9052a9661c44f4e (diff)
merge
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake1
-rw-r--r--install.xml4
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>