diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 15:43:34 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 15:43:34 +0300 |
commit | eab5beb54cacc2b0dc2cddad4a78634e7468a298 (patch) | |
tree | 51f17910f529af57819bcd77f1a7dd9e92f6291e /autobuild.xml | |
parent | 00e09ddcad8ec2c33ecbcdd0da09bd7819bc3509 (diff) | |
parent | cc8fdf341dbbe6ab940d7b24bcf81cbed252cb69 (diff) |
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
Diffstat (limited to 'autobuild.xml')
-rw-r--r-- | autobuild.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index 1afc46a198..73ad9d6fd8 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1494,11 +1494,11 @@ <key>archive</key> <map> <key>hash</key> - <string>e50ea94bbaa4ff41bf53b84b7192df1a694c5337</string> + <string>3a3e14563cd5fc019c3f139b82aa46ec79847709</string> <key>hash_algorithm</key> <string>sha1</string> <key>url</key> - <string>https://github.com/secondlife/llca/releases/download/v202310121525.0-d22bd98/llca-202310121530.0-common-d22bd98.tar.zst</string> + <string>https://github.com/secondlife/llca/releases/download/v202312051403.17-0f5d9c3/llca-202312051404.0-common-0f5d9c3.tar.zst</string> </map> <key>name</key> <string>common</string> @@ -1512,7 +1512,7 @@ <string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project. </string> <key>version</key> - <string>202310121530.0</string> + <string>202312051404.0</string> <key>name</key> <string>llca</string> </map> |