Ansariel bfd99549b0 Merge branch 'release/2025.05' of https://github.com/secondlife/viewer ... # Conflicts: # .github/pull_request_template.md # indra/llappearance/lltexlayer.cpp # indra/llcommon/llthread.cpp # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/lldaeloader.h # indra/llprimitive/llmodel.cpp # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/settings.xml # indra/newview/llmodelpreview.cpp # indra/newview/lltoolpie.cpp # indra/newview/skins/default/xui/en/floater_model_preview.xml # indra/newview/skins/default/xui/en/panel_preferences_sound.xml		2025-07-18 14:14:54 +02:00
..
workflows	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-18 14:14:54 +02:00
dependabot.yml	…
labeler.yaml	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development	2024-06-21 19:10:44 +02:00
pull_request_template.md	Fix link in pull_request_template.md (#4329)	2025-07-02 09:50:23 -07:00