diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-20 01:23:16 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-20 01:23:16 +0200 |
| commit | dca3c83cd9f8d1ac8165707b080a420bf9a9a132 (patch) | |
| tree | c73c0e7e4146c5191a9caf0b54ceb2b566fd5eb6 /doc/contributions.txt | |
| parent | ffa8d83eaf11b11a091743c6d666cc6c74553671 (diff) | |
| parent | f7838ca17c7e4a5a595f5cb898c70a18be4c9cd9 (diff) | |
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
Diffstat (limited to 'doc/contributions.txt')
| -rwxr-xr-x | doc/contributions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 4c56ef86dc..fa40bd327a 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1127,6 +1127,7 @@ Nicky Dasmijn SL-14541 SL-16438 SL-17218 + SL-17238 SL-17585 Nicky Perian OPEN-1 |