summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-18 21:36:27 -0500
committerOz Linden <oz@lindenlab.com>2011-02-18 21:36:27 -0500
commit101167d3ae7c15125d2e83f6c52c0781ebcb4bee (patch)
tree8d2cd61dcd3bd49e7b9e669f3919fccd308a964b
parent7ce5f16fabbc92e81b0f7397e4c90d9130860fb4 (diff)
parent69855f9d34cce116ceda1a4e5c914547d68f0cff (diff)
Automated merge with ssh://bitbucket.org/oz_linden/viewer-vs2010
-rw-r--r--autobuild.xml16
1 files changed, 2 insertions, 14 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 4518ef06ec..3cce930f28 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -860,9 +860,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4a4d88f6ba42fa0acd47881f2d7ed7a7</string>
+ <string>a202ec58cef9097c94acfa958ed6da8d</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-windows-20101001b.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/221594/arch/CYGWIN/installer/jpeglib-8c-windows-20110217.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -1131,18 +1131,6 @@
<key>name</key>
<string>linux</string>
</map>
- <key>windows</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>178a79f9af90b16f0a62430f9fe88f28</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-windows-20101001a.tar.bz2</string>
- </map>
- <key>name</key>
- <string>windows</string>
- </map>
</map>
</map>
<key>ndofdev</key>