mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 00:48:30 +00:00
# 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