diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-18 07:08:59 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-18 07:57:29 +0200 |
| commit | c87850ddab5604e57fdcebad6a53616232a1b648 (patch) | |
| tree | 47da586a3b93b1cbd9af9db5f81f65bf066306cd /doc | |
| parent | f5a7c22cea16b51db12360436ce64c2433a5aa5f (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index dc4287b2b2..9497ad0644 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -240,6 +240,7 @@ Ansariel Hiller SL-18432 SL-19140 SL-4126 + SL-20224 SL-20524 Aralara Rajal Arare Chantilly @@ -930,6 +931,8 @@ LSL Scientist Lamorna Proctor Lares Carter Larry Pixel +Lars Næsbye Christensen + SL-20054 Laurent Bechir Leal Choche Lenae Munz |