diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-12 04:37:42 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-12 04:37:42 +0200 |
| commit | f9866a3543e1e13404891c949a3ceca482d2f649 (patch) | |
| tree | 34e170a4bbe0c9c60832821fdf3246c883b6cf53 /doc | |
| parent | a66ea0a9089f9525a9e92ae3e7ebed412ffd53e1 (diff) | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
Merge branch 'main' into DRTVWR-573-maint-R
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
Diffstat (limited to 'doc')
| -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 9368781c9a..4cabb84b10 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -282,6 +282,7 @@ Beq Janus SL-11300 SL-15709 SL-16021 + SL-18637 Beth Walcher Bezilon Kasei Biancaluce Robbiani |