Ansariel 82b05f1063 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llfloater.h # indra/newview/llfloatersnapshot.h # indra/newview/llstatusbar.cpp # indra/newview/llviewerwindow.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/de/strings.xml # indra/newview/skins/default/xui/en/floater_snapshot.xml # indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/en/panel_tools_texture.xml # indra/newview/skins/default/xui/es/strings.xml # indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/fr/strings.xml # indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/it/strings.xml # indra/newview/skins/default/xui/ja/panel_settings_water.xml # indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/ja/strings.xml # indra/newview/skins/default/xui/pt/strings.xml # indra/newview/skins/default/xui/ru/strings.xml # indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/zh/strings.xml # scripts/messages/message_template.msg # scripts/messages/message_template.msg.sha1		2025-03-31 23:55:28 +02:00
..
message_template.msg	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00
message_template.msg.sha1	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00