Ansariel 469795979f Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llpanelface.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/colors.xml		2025-05-14 21:56:38 +02:00
..
CMakeLists.txt	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-21 00:46:46 +02:00
llwebrtc.cpp	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-05-14 21:56:38 +02:00
llwebrtc.h	…
llwebrtc_impl.h	Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop	2024-08-20 09:44:14 -07:00