Files
phoenix-firestorm/.github
Ansariel 47925009f8 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/workflows/build.yaml
#	indra/cmake/Python.cmake
#	indra/cmake/Velopack.cmake
#	indra/lib/python/indra/util/llmanifest.py
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llpanellogin.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llvelopack.cpp
#	indra/newview/llvelopack.h
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/viewer_manifest.py
2026-04-08 22:09:24 +02:00
..