Ansariel 355a80ab91 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimagej2coj/llimagej2coj.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llfloaterworldmap.h # indra/newview/llviewertexturelist.cpp # indra/newview/skins/default/xui/en/floater_world_map.xml		2025-05-23 13:13:24 +02:00
..
workflows	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-05-23 13:13:24 +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