Ansariel 04d32cf7eb Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llviewermenu.cpp # indra/newview/skins/default/xui/en/floater_scene_load_stats.xml # indra/newview/skins/default/xui/en/floater_world_map.xml # indra/newview/skins/default/xui/en/menu_viewer.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_preferences_advanced.xml # indra/newview/skins/default/xui/en/panel_preferences_sound.xml # indra/newview/skins/default/xui/en/panel_profile_pick.xml # indra/newview/skins/default/xui/en/panel_volume_pulldown.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml		2024-01-26 14:29:44 +01:00
..
ansastorm	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master	2024-01-09 09:37:38 +01:00
default	Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer	2024-01-26 14:29:44 +01:00
firestorm	…
metaharper	…
starlight	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master	2024-01-09 09:37:38 +01:00
starlightcui	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master	2024-01-09 09:37:38 +01:00
vintage	Vintage: use same wording for Sort by Most Recent as the default skin	2024-01-12 02:52:29 +01:00
skins.xml	…