diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:45:23 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 13:45:23 -0800 |
commit | af2cbcee129911cb4e1d25fbd710d755c13b0282 (patch) | |
tree | a09d45e10d3b03c94256424ecd8f881e75551aae /install.xml | |
parent | 0a955ae550d3b810da67a17848a6cbc5ef11edb5 (diff) | |
parent | 23a266521ead539cb3e8c2c76e7ead46847b70ca (diff) |
Merge from viewer2, including fix for the test failure biting qarl.
Minor conflict in llviewerfloaterreg.cpp resolved.
Diffstat (limited to 'install.xml')
-rw-r--r-- | install.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/install.xml b/install.xml index 41f8a28044..e912ddfd8b 100644 --- a/install.xml +++ b/install.xml @@ -1014,23 +1014,23 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>5362a53488693f9bd7d9083758af25eb</string> + <string>2eb58f544c0d912aa382de2c947be7f1</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20091218.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100104.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>09674cbae982e7e7f6ebc7e1d06580e8</string> + <string>c4c40fca14a8bd32096f8a27c75c526f</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20091216.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100105c.tar.bz2</uri> </map> <key>windows</key> <map> <key>md5sum</key> - <string>4dd305f2ce38b2e55a2014ad3a2de34d</string> + <string>b50db4fdb833111e1e679188e4cb5815</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20091218.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100104.tar.bz2</uri> </map> </map> </map> |