Ansariel a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimage/llimage.cpp # indra/llimage/llimage.h # indra/llkdu/llimagej2ckdu.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfavoritesbar.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterpreference.h # scripts/messages/message_template.msg.sha1		2024-02-06 17:58:20 +01:00
..
message_template.msg	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-06 17:58:20 +01:00
message_template.msg.sha1	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-02-06 17:58:20 +01:00