diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-31 01:58:09 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-31 01:58:09 +0300 |
| commit | 9b0569840f06137ee2379463f5028a5342c3555a (patch) | |
| tree | 279eaa517131fe4e073d8d9781e0b69e747a0bb9 /doc | |
| parent | 1e09d25d9ce8b7ec8da28ad5364d81c0faab9d0a (diff) | |
| parent | cdbd06e8ed6e3f4285a61f5c0b607a65dfdf8dfd (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 669a0cd671..0acf92b189 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -278,6 +278,7 @@ Beq Janus SL-14766 SL-14927 SL-11300 + SL-15709 SL-16021 Beth Walcher Bezilon Kasei @@ -1370,7 +1371,7 @@ Sovereign Engineer MAINT-7343 SL-11079 OPEN-343 - SL-11625 + SL-11625 BUG-229030 SL-14705 SL-14706 @@ -1378,6 +1379,7 @@ Sovereign Engineer SL-14731 SL-14732 SL-15096 + SL-16127 SpacedOut Frye VWR-34 VWR-45 |