diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-21 16:40:22 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-21 18:19:27 +0300 |
| commit | 24fb2f83362f3aaffed42360f750bc4c82037c39 (patch) | |
| tree | 59fe52d1791350c66b9e9b1d5d5c2cea6e29558e /indra/newview/app_settings/viewerart.xml | |
| parent | fd751f4e99557f4d1ef9cbdc4ab7b7a765b563d1 (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/newview/app_settings/viewerart.xml')
0 files changed, 0 insertions, 0 deletions