diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 03:55:09 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 03:55:09 +0300 |
commit | 8fa956a16e616191e21bf001eabc4670453debcd (patch) | |
tree | aecadf995f0174cc41f7cb9846a1382a930d8f82 /autobuild.xml | |
parent | 37392be4171303db08a4842b7882b4cb758a8f8d (diff) | |
parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) |
Merge branch 'main' into marchcat/b-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/newview/lloutfitslist.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 4fa94e96dc..90f6b9eb69 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1594,11 +1594,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> @@ -1612,7 +1612,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> |