diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-04-18 23:42:39 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-04-18 23:42:39 +0300 |
| commit | ce4c694b66b1e4ed479e5143b10616a76f2da18b (patch) | |
| tree | ac4bd223fae0764c2c86e34283871f8cfafdafd8 /autobuild.xml | |
| parent | e33f23f58a2caa561dfe4b3b114786f40983d136 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge branch master (D540) into DRTVWR-546
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.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 1f1ee45549..9185b8af22 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2107,18 +2107,18 @@ <key>archive</key> <map> <key>hash</key> - <string>95cb09a712b7b61e992fe68ab7bf8c72</string> + <string>d6e7ab8483c348f223fd24028e27a52f</string> <key>hash_algorithm</key> <string>md5</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/92744/837149/llca-202201010217.567162-common-567162.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93933/844890/llca-202202010217.567974-common-567974.tar.bz2</string> </map> <key>name</key> <string>common</string> </map> </map> <key>version</key> - <string>202201010217.567162</string> + <string>202202010217.567974</string> </map> <key>llphysicsextensions_source</key> <map> |