Ansariel e7b3d68cab Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/LLPhysicsExtensions.cmake # indra/llprimitive/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/lltexturectrl.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/floater_marketplace.xml # indra/newview/skins/default/xui/en/floater_model_preview.xml # indra/newview/skins/default/xui/en/floater_search.xml		2025-10-11 18:51:03 +02:00
..
workflows	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-11 18:51:03 +02:00
dependabot.yml	Create dependabot.yml for github-actions	2024-04-03 17:10:03 +01:00
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	Add media request to pull_request_template.md (#4440)	2025-07-26 11:29:12 -07:00