Go to file
Ansariel e5c7fd4fff Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llrender/llgl.cpp
#	indra/newview/llface.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 12:55:19 +02:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
etc
…
indra Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-27 12:55:19 +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 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
build.sh
…
build_target.sh
…