diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-21 19:55:59 +0300 |
| commit | 8756727a525f3c4f72d790adafb8d719dfc24a94 (patch) | |
| tree | ee201c54b5e218ed449bb90c398355c0c88ffa4e /indra/llrender/llgltypes.h | |
| parent | 8f07f8e233ed5ed6c5a7b6f797d0ee7b18b652e2 (diff) | |
| parent | 4bda6873ee7baac1ac34f92178d871c430da88c6 (diff) | |
Merge branch 'develop' into marchcat/b-develop
# Conflicts:
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/llrender/llgltypes.h')
0 files changed, 0 insertions, 0 deletions