Go to file
Ansariel 0ae0cd0c88 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llrendertarget.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
2022-10-24 20:01:04 +02:00
.github/workflows
…
doc
…
etc
…
indra Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-10-24 20:01:04 +02:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 01:41:17 +02:00
.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/phoenix-firestorm 2022-10-24 19:54:30 +02:00
build.sh
…
build_target.sh
…