diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-02 17:42:14 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-02 17:57:11 +0300 |
| commit | ade8c96e5c68f672d33802f4a82ce46ccffd7816 (patch) | |
| tree | 0f8c75d3657ce11c38a8d98b081b3b08b64de104 /indra/edit-me-to-trigger-new-build.txt | |
| parent | 002ff88a130b16f03e26e159f7ea5f38782b16b6 (diff) | |
| parent | 7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff) | |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappviewer.cpp
Diffstat (limited to 'indra/edit-me-to-trigger-new-build.txt')
| -rw-r--r-- | indra/edit-me-to-trigger-new-build.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/edit-me-to-trigger-new-build.txt b/indra/edit-me-to-trigger-new-build.txt index eab7c17b71..8b13789179 100644 --- a/indra/edit-me-to-trigger-new-build.txt +++ b/indra/edit-me-to-trigger-new-build.txt @@ -1,4 +1 @@ -euclid 5/29/2020 -euclid 7/23/2020 -euclid 4/29/2021 -euclid 10/5/2021 DRTVWR-546 + |