Ansariel 7adeeae86b Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llui/llfloater.cpp # indra/llui/llfloater.h # indra/llui/lllineeditor.h # indra/llui/llscrolllistctrl.h # indra/llui/lltextbase.h # indra/newview/llchicletbar.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llnavigationbar.h # indra/newview/lltextureview.cpp # indra/newview/lltoolcomp.h # indra/newview/lltoolfocus.h # indra/newview/llvoicevivox.h # indra/newview/llworldmapview.cpp		2024-03-13 02:47:00 +01:00
..
workflows	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-03-13 02:47:00 +01:00
labeler.yaml	Add automatic PR labels	2022-11-18 07:39:54 -08:00