Go to file
Ansariel fe243a3042 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llworld.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
2023-06-27 13:14:11 +02:00
.github Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-06-27 12:21:43 +02:00
doc
…
etc
…
fsutils
…
indra Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-06-27 13:14:11 +02:00
scripts
…
.clang-format
…
.gitattributes
…
.gitignore
…
.pre-commit-config.yaml
…
BuildParams
…
FIRESTORM-SOURCE_LICENSE_HEADER.txt
…
LICENSE
…
README_BUILD_FIRESTORM_LINUX.txt
…
README_BUILD_FIRESTORM_MACOSX.txt
…
README_BUILD_FIRESTORM_WINDOWS.txt
…
autobuild.xml Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-06-27 12:21:43 +02:00
build.sh
…
build_target.sh
…
requirements.txt
…