diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 |
| commit | 033b04f3883a0cc9024f45b5e9a0d792cf6dbb77 (patch) | |
| tree | ac49627e31aabda8aaa4b21c74c5aee2b2ea46e8 /autobuild.xml | |
| parent | 07dc391ab76a8860d04bfb001cdc686cd576663d (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.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 e4ff35b7e7..b1cfe79275 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -611,9 +611,9 @@ <key>archive</key> <map> <key>hash</key> - <string>8de71c518c248d77f70f87ab5e9de732</string> + <string>5a1d52ec3981292855a179be86988a02</string> <key>url</key> - <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/105828/925920/fmodstudio-2.02.06.575716-darwin64-575716.tar.bz2</string> + <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/112152/972159/fmodstudio-2.02.13.578928-darwin64-578928.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -635,9 +635,9 @@ <key>archive</key> <map> <key>hash</key> - <string>2eea946ee7a572b748cec0c623ade3ef</string> + <string>8594ec180b73be42d37b6f93ac59ab4a</string> <key>url</key> - <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/105830/925932/fmodstudio-2.02.06.575716-windows-575716.tar.bz2</string> + <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/112153/972171/fmodstudio-2.02.13.578928-windows-578928.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -647,16 +647,16 @@ <key>archive</key> <map> <key>hash</key> - <string>483d6fd5d057b0a681bffef9b8b9d927</string> + <string>46941a2610f83c353e551d300e536c54</string> <key>url</key> - <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/105829/925931/fmodstudio-2.02.06.575716-windows64-575716.tar.bz2</string> + <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/112154/972170/fmodstudio-2.02.13.578928-windows64-578928.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>2.02.06.575716</string> + <string>2.02.13.578928</string> </map> <key>fontconfig</key> <map> |