Ansariel 5c03f284af Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/APR.cmake # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llsurface.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/viewer_manifest.py		2025-10-18 13:01:08 +02:00
..
html	…
textures	Possibly a better icon for the new Camera TPP preset button #2	2025-09-15 22:11:55 +02:00
themes/textures	…
xui	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-18 13:01:08 +02:00
colors.xml	…
default_languages.xml	…
settings.xml	…
toolbars.xml	…