diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-12-12 20:53:11 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-12-12 20:53:11 +0200 |
| commit | f836194516d3ddf0bb8d63bf4b58b6add6387d2d (patch) | |
| tree | c436c33f51ed07f8157f0e0974f492d94a305e88 /indra/llwindow/llopenglview-objc.mm | |
| parent | b4dd4271a1317c79aac4cf03a6612523e7a88ce4 (diff) | |
| parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
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
Diffstat (limited to 'indra/llwindow/llopenglview-objc.mm')
0 files changed, 0 insertions, 0 deletions