Ansariel e33d2fad5f Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development ... # Conflicts: # indra/newview/llimview.h # indra/newview/llpanelpeople.h # indra/newview/llpanelvoicedevicesettings.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.cpp # indra/newview/llvoiceclient.h # indra/newview/llvoicevivox.cpp # indra/newview/llvoicevivox.h		2024-06-21 19:10:44 +02:00
..
workflows	Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer	2024-06-12 11:38:14 +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