diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-02 22:36:26 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-02 22:42:32 +0200 |
| commit | 5c5a1973a137c05b8b25498158e36adc6dcf2717 (patch) | |
| tree | 9356957de15709f3c86f0bd71fc121558753e46f /autobuild.xml | |
| parent | f2cf005e0ef69c0018e3dd338a11d3dc2a3e0cfb (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-540-maint
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
Diffstat (limited to 'autobuild.xml')
| -rw-r--r-- | autobuild.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/autobuild.xml b/autobuild.xml index b1fa096138..d62a00fab9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ <key>archive</key> <map> <key>hash</key> - <string>49fff41e17e06cdf9eb0c737d20df52f</string> + <string>45dedb5b09995cd794304150e94fcf21</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83411/779825/dullahan-1.12.2.202106220202_91.1.21_g9dd45fe_chromium-91.0.4472.114-darwin64-560751.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87950/806969/dullahan-1.12.2.202109170444_91.1.21_g9dd45fe_chromium-91.0.4472.114-darwin64-563968.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -592,9 +592,9 @@ <key>archive</key> <map> <key>hash</key> - <string>f51f324d50a2461cda273e84fa65e0ad</string> + <string>d0fd9d7086699da4bb5ccc935622a717</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83413/779836/dullahan-1.12.2.202106220213_91.1.21_g9dd45fe_chromium-91.0.4472.114-windows-560751.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/88276/809277/dullahan-1.12.2.202109230751_91.1.21_g9dd45fe_chromium-91.0.4472.114-windows-563968.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -604,16 +604,16 @@ <key>archive</key> <map> <key>hash</key> - <string>d3df46f6592715c75df2bf520c1ad68b</string> + <string>7e8c3ccd420ff5aef24ff72d609ba394</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/83412/779840/dullahan-1.12.2.202106220213_91.1.21_g9dd45fe_chromium-91.0.4472.114-windows64-560751.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/88275/809281/dullahan-1.12.2.202109230751_91.1.21_g9dd45fe_chromium-91.0.4472.114-windows64-563968.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.12.2.202106220213_91.1.21_g9dd45fe_chromium-91.0.4472.114</string> + <string>1.12.2.202109230751_91.1.21_g9dd45fe_chromium-91.0.4472.114</string> </map> <key>elfio</key> <map> |