summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-11-30 12:28:26 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-11-30 12:28:26 +0200
commit0465c761a4cd14003d57d33f5edaa185d6fd7a01 (patch)
tree76f09c1be0da0b960bc4e18378c07439fbe0071f /doc
parent683bf84bb38adc88d4a4b7fedaed89b41fcac45e (diff)
parent43cf06b79e1a7d514f939b9511c3100da2768169 (diff)
Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index af8b259c74..235e223d70 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -291,6 +291,7 @@ Beq Janus
SL-18637
SL-19317
SL-19660
+ SL-20610
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani