diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
| commit | 4dcab10bf8a652c6513bf6c9eec3184f79d4d219 (patch) | |
| tree | 3cb870beefc8c0488532e0b424450780357ed7f5 /doc/contributions.txt | |
| parent | 42f16180a985fc0e4704a4e25489ada9d662631a (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
Diffstat (limited to 'doc/contributions.txt')
| -rwxr-xr-x | doc/contributions.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e75a45c076..e764e89e35 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -237,6 +237,7 @@ Ansariel Hiller SL-15227 SL-15398 SL-18432 + SL-4126 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -287,6 +288,7 @@ Beq Janus SL-18592 SL-18637 SL-19317 + SL-19660 Beth Walcher Bezilon Kasei Biancaluce Robbiani @@ -495,6 +497,8 @@ Evangelista Emerald Faelon Swordthain Farallon Greyskin VWR-2036 +Fawrsk + SL-18893 Feep Larsson VWR-447 VWR-1314 @@ -587,6 +591,8 @@ Henri Beauchamp VWR-1320 VWR-1406 VWR-4157 + SL-15175 + SL-19110 herina Bode Hikkoshi Sakai VWR-429 @@ -1178,6 +1184,9 @@ Orenj Marat Orion Delphis Oryx Tempel PanteraPolnocy + SL-18891 + SL-18904 + SL-18937 SL-19681 Parvati Silverweb Patric Mills |