diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-07-25 13:15:43 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-07-25 13:15:43 +0300 |
| commit | 398bf4f76a275ac08524f6218a707251b171271e (patch) | |
| tree | 31ed47010ec5db0afac932b1c1d87b4a3fd75c75 /indra/llxml/llxmlparser.cpp | |
| parent | 34b74530d216a1edc5dfffe327baa615e3654460 (diff) | |
| parent | 92154ed36ffddac349ac2336a3cc5a1eb6eebb72 (diff) | |
Merge branch 'release/26.3' into marchcat/slua-26.3
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/newview/featuretable.txt
# indra/newview/featuretable_linux.txt
# indra/newview/featuretable_mac.txt
Diffstat (limited to 'indra/llxml/llxmlparser.cpp')
0 files changed, 0 insertions, 0 deletions