diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-26 02:56:29 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-26 02:56:29 +0300 |
| commit | 2ed401882e5ee28415c2ec70e6391855c006769f (patch) | |
| tree | 7f433f9a6dc6751618c7271337a7e84f685e5727 /indra/edit-me-to-trigger-new-build.txt | |
| parent | 23d310436a664f7303d627095f8972de6cb17334 (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llviewertexturelist.cpp
Diffstat (limited to 'indra/edit-me-to-trigger-new-build.txt')
| -rw-r--r-- | indra/edit-me-to-trigger-new-build.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt index ade83202cf..eab7c17b71 100644 --- a/indra/edit-me-to-trigger-new-build.txt +++ b/indra/edit-me-to-trigger-new-build.txt @@ -1,3 +1,4 @@ euclid 5/29/2020 euclid 7/23/2020 euclid 4/29/2021 +euclid 10/5/2021 DRTVWR-546 |