diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-11-30 13:02:19 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-11-30 13:30:27 +0200 |
| commit | 27dae1d96753634c40619af8bc5b982f5238289b (patch) | |
| tree | c0a0e28d016ee08f82033385450c71b5a268e0ad /doc/contributions.txt | |
| parent | 683bf84bb38adc88d4a4b7fedaed89b41fcac45e (diff) | |
| parent | 110eb2c989b6655796c15a657d0898375027f3f2 (diff) | |
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
Diffstat (limited to 'doc/contributions.txt')
| -rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index af8b259c74..dc4287b2b2 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -240,6 +240,7 @@ Ansariel Hiller SL-18432 SL-19140 SL-4126 + SL-20524 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -382,6 +383,7 @@ Chaser Zaks BUG-225599 BUG-227485 SL-16874 + SL-20442 Cherry Cheevers ChickyBabes Zuzu Chorazin Allen |