Ansariel 450d02ad39 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # .github/ISSUE_TEMPLATE/10-bug.yaml # indra/llui/lldockcontrol.cpp # indra/llui/llscrolllistctrl.cpp # indra/llui/llviewereventrecorder.cpp # indra/newview/llfloaterland.cpp # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llpanelgroup.cpp # indra/newview/llpanelgrouproles.cpp # indra/newview/llpanelland.cpp # indra/newview/llphysicsmotion.cpp # indra/newview/lltexturectrl.h # indra/newview/lltoolpie.cpp # indra/newview/llviewermenu.cpp		2024-07-25 20:47:57 +02:00
..
workflows	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-25 20:47:57 +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	Tidy up the PR guidance a bit a make it less clunky (hopefully)	2024-07-17 22:09:25 +01:00