Go to file
Ansariel e6f3c39327 Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.cpp
#	indra/llappearance/llwearable.cpp
#	indra/newview/llinventorymodel.cpp
2023-12-12 14:53:58 +01:00
.github Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-12-02 19:11:18 +01:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-01 13:10:11 +01:00
etc
…
fsutils
…
indra Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 2023-12-12 14:53:58 +01:00
scripts Merge branch 'DRTVWR-591-maint-X' of H:/ViewerDev/viewer-591 2023-11-30 19:31:04 +01:00
.clang-format
…
.gitattributes
…
.gitignore Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-12-02 19:11:18 +01:00
.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-11-20 13:05:09 +01:00
build.sh
…
build_target.sh
…
buildscripts_support_functions
…
requirements.txt
…