phoenix-firestorm/scripts/messages
Ansariel 7c8a1dec41 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfloater.h
#	scripts/messages/message_template.msg.sha1
2025-03-08 12:59:32 +01:00
..
message_template.msg Merge branch 'develop' of https://github.com/secondlife/viewer 2025-03-08 12:59:32 +01:00
message_template.msg.sha1 Merge branch 'develop' of https://github.com/secondlife/viewer 2025-03-08 12:59:32 +01:00