phoenix-firestorm/scripts/messages
Ansariel 5f9fb4a395 Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/newview/CMakeLists.txt
#	indra/newview/installers/darwin/release-dmg/_VolumeIcon.icns
#	indra/newview/installers/darwin/release-dmg/background.jpg
#	scripts/messages/message_template.msg.sha1
2023-10-26 21:25:27 +02:00
..
message_template.msg Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 2023-10-26 21:25:27 +02:00
message_template.msg.sha1 Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 2023-10-26 21:25:27 +02:00