Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

meow-7.2.2
Nat Goodspeed 2010-02-03 15:52:35 -05:00
commit 5d3e35db06
2 changed files with 9 additions and 8 deletions

View File

@ -269,6 +269,7 @@ namespace tut
template<> template<>
void HTTPClientTestObject::test<2>()
{
skip("error test depends on dev's local ISP not supplying \"helpful\" search page");
LLHTTPClient::get("http://www.invalid", newResult());
runThePump();
ensureStatusError();

View File

@ -193,30 +193,30 @@
<key>darwin</key>
<map>
<key>md5sum</key>
<string>609c469ee1857723260b5a9943b9c2c1</string>
<string>84821102cb819257a66c8f38732647fc</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20091202.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100119.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>7085044567999489d82b9ed28f16e480</string>
<string>ee8e1b4bbcf137a84d6a85a1c51386ff</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20091202.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100119.tar.bz2</uri>
</map>
<key>linux64</key>
<map>
<key>md5sum</key>
<string>b4aeefcba3d749f1e9f2a12c6f70192b</string>
<string>af4badd6b2c10bc4db82ff1256695892</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux64-20091202.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux64-20100119.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>6746ae9fd9aff98b15f7b9f0f40334ab</string>
<string>acbf7a4165a917a4e087879d1756b355</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091204.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100119.tar.bz2</uri>
</map>
</map>
</map>