Go to file
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 10:12:19 +01:00
etc
indra Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-28 23:00:17 +02:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 10:12:19 +01:00
.clang-format
.gitattributes
.gitignore Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-02-02 09:39:17 +01:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-03-08 19:25:02 +00:00
BuildParams DRTVWR-550 moved viewer channel value out of BuildParams and into TC parameters 2022-01-18 17:30:46 -08:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt
README_BUILD_FIRESTORM_LINUX.txt Add example for using multithreaded xz compression to linux build instructions 2022-02-15 17:10:52 +01:00
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-28 23:00:17 +02:00
build.sh
build_target.sh