Ansariel 5e5a3f4102 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/lltextbase.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/lleventpoll.cpp		2025-09-22 23:11:55 +02:00
..
workflows	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-09-22 23:11:55 +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