diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-12 10:31:27 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-12 10:31:27 -0700 |
| commit | d12c897bfc77a800fcec5e22a21c9d0344b0d0bc (patch) | |
| tree | 18752bdf92b12fce68642c94acec2d78b9c43fbe /indra/media_plugins/CMakeLists.txt | |
| parent | 9775d7ea10ff87d913b1ba361a9204f961cd9c3f (diff) | |
| parent | f0de2ba6340e0d540aa70ac0086defde52cf60af (diff) | |
Merge remote-tracking branch 'origin/project/gltf_development' into brad/maint-a-merge-to-gltf-dev
# Conflicts:
# indra/newview/gltf/primitive.cpp
Diffstat (limited to 'indra/media_plugins/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions