Go to file
Ansariel 835d454a52 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llviewerparcelmgr.cpp
2022-07-15 13:12:50 +02:00
doc
…
etc
…
indra Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-07-15 13:12:50 +02:00
scripts
…
.clang-format
…
.gitattributes
…
.gitignore
…
.pre-commit-config.yaml
…
BuildParams
…
FIRESTORM-SOURCE_LICENSE_HEADER.txt
…
README_BUILD_FIRESTORM_LINUX.txt
…
README_BUILD_FIRESTORM_MACOSX.txt
…
README_BUILD_FIRESTORM_WINDOWS.txt
…
autobuild.xml
…
build.sh
…
build_target.sh
…