Go to file
Ansariel 1d8360e8bb Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/objects/previewV.glsl
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewershadermgr.cpp
2023-07-04 14:18:58 +02:00
.github Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-07-04 13:07:30 +02:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-17 21:40:54 +02:00
etc
fsutils Don't strip the leading md5sum char unless its a '\' 2023-05-15 00:27:08 +01:00
indra Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-04 14:18:58 +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