Ansariel 5e75273b49 Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer ...

# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llvoiceclient.h
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvoicevivox.h
#	indra/newview/viewer_manifest.py
#	scripts/messages/message_template.msg.sha1

2024-03-19 17:09:42 +01:00

..

message.xml

Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer

2024-03-19 17:09:42 +01:00