Ansariel 39a6735fc9 Merge branch 'main' of https://github.com/secondlife/viewer ... # Conflicts: # .gitignore # autobuild.xml # indra/cmake/APR.cmake # indra/newview/CMakeLists.txt # indra/newview/installers/windows/installer_template.nsi # indra/newview/viewer_manifest.py # indra/test/namedtempfile.h		2023-10-26 15:49:12 +02:00
..
indra	Merge branch 'main' of https://github.com/secondlife/viewer	2023-10-26 15:49:12 +02:00