phoenix-firestorm/.github
Ansariel dac7725c40 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/skins/default/xui/en/panel_preferences_setup.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
2025-02-03 16:11:21 +01:00
..
workflows Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-02-03 16:11:21 +01: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