diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-10 23:51:52 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-01-10 23:51:52 +0200 |
| commit | 469ce7f7f6828aa8ed8d45fdff82cb33c1ec655d (patch) | |
| tree | 6ec74d5dbe9c278663a99212cddf808e87d4e6c6 /autobuild.xml | |
| parent | 83b4ea59fc8793ccbfb6b40ffff111de14ebd4d3 (diff) | |
| parent | ee2d618706a8803372b92dbe47a165c70be6cef9 (diff) | |
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index b47dccde3c..3a7b3cd23d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3194,9 +3194,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>c42575ac8997de979eadb082c33a578e</string> + <string>b97d0f6570104277de92d0d3f2d1111d</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/81322/765512/uriparser-0.9.4-darwin64-559132.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89474/816487/uriparser-0.9.4-darwin64-564957.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3230,9 +3230,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>901b1063556fc6b2575e745eef2bf744</string> + <string>e2600c798e220cc98c1cc77341aee00d</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/81323/765528/uriparser-0.9.4-windows-559132.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89476/816496/uriparser-0.9.4-windows-564957.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3242,9 +3242,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>962c01d553f286c430102998129fb0d6</string> + <string>50d857117d31844fc8b84b07b795fd00</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/81324/765527/uriparser-0.9.4-windows64-559132.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/89475/816497/uriparser-0.9.4-windows64-564957.tar.bz2</string> </map> <key>name</key> <string>windows64</string> |