Ansariel d4ecdfa917 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/fspanelface.cpp # indra/newview/fspanelface.h # indra/newview/llfloaterland.cpp # indra/newview/llviewercamera.h # indra/newview/llviewerwindow.cpp # indra/newview/vjlocalmesh.cpp		2024-06-16 20:56:54 +02:00
..
workflows	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-16 20:56:54 +02:00
dependabot.yml	Create dependabot.yml for github-actions	2024-04-03 17:10:03 +01:00
labeler.yaml	Trim trailing whitespace	2024-05-29 08:10:00 -07:00