Go to file
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 18:23:17 +02:00
etc
indra Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 16:04:49 +02:00
scripts Set correct root project name and build type in CMake and don't use VSTool by default 2022-08-13 17:09:24 +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-08-31 16:04:49 +02:00
build.sh
build_target.sh