Skip to content
Snippets Groups Projects
Commit f8361945 authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merge branch 'main' into DRTVWR-570-maint-Q 

# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
parents b4dd4271 a0c3d69c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 107 additions and 261 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment