diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-03-16 19:29:55 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-03-16 19:29:55 -0400 |
| commit | 55afeb9f547704e3aa6af646192d90c9dca60187 (patch) | |
| tree | c7c2efde152bcc13ca830c954233b51cbb3bb7be | |
| parent | 4d11d30a3e241ccc52f099079f597a71142a187e (diff) | |
| parent | 4b66f1e0134d3275e852e6387570d6bfe479a1e1 (diff) | |
Merge.
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/autobuild.xml b/autobuild.xml index 676fae6aa1..06f37044e9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -234,9 +234,9 @@ <key>archive</key> <map> <key>hash</key> - <string>89b89ad923816317e1a3be963b406f27</string> + <string>aaea644191807f51051cefa2fac11069</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/219379/arch/Darwin/installer/curl-7.21.1-darwin-20110120.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/224181/arch/Darwin/installer/curl-7.21.1-darwin-20110316.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -246,9 +246,9 @@ <key>archive</key> <map> <key>hash</key> - <string>65ca0a9b42de855ea574e454ec2e14c3</string> + <string>2d9377951d99a1aa4735cea8d4b5aa71</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/220996/arch/Linux/installer/curl-7.21.1-linux-20110308.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-curl/rev/224181/arch/Linux/installer/curl-7.21.1-linux-20110316.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index dad0519a8a..f600cb42b0 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -934,6 +934,8 @@ class Linux_i686Manifest(LinuxManifest): self.path("libapr-1.so.0.4.2") self.path("libaprutil-1.so.0.3.10") self.path("libbreakpad_client.so.0.0.0") + self.path("libbreakpad_client.so.0") + self.path("libbreakpad_client.so") self.path("libdb-5.1.so") self.path("libcrypto.so.0.9.8") self.path("libexpat.so.1.5.2") |