summaryrefslogtreecommitdiff
path: root/autobuild.xml
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2021-07-19 17:43:19 -0700
committerCallum Prentice <callum@lindenlab.com>2021-07-19 17:43:19 -0700
commita242edc99d62f9f242c2f7f778f347af03a6f5a9 (patch)
tree74c5672c9a045e5c8891702cc77eae9062dc9756 /autobuild.xml
parent95b26d3becf8fef901ea09998866a9d8227cdcad (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)
Diffstat (limited to 'autobuild.xml')
-rw-r--r--autobuild.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 49f76dffc0..4768bd25c6 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2187,18 +2187,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>40a87f5d505a141b2ec79513a6197c35</string>
+ <string>0a6349b11c8e9d34f0c80b8081736e75</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
- <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/76516/728250/llca-202102021657.555615-common-555615.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/79438/751815/llca-202104010215.557744-common-557744.tar.bz2</string>
</map>
<key>name</key>
<string>common</string>
</map>
</map>
<key>version</key>
- <string>202102021657.555615</string>
+ <string>202104010215.557744</string>
</map>
<key>llphysicsextensions_source</key>
<map>