Fork of https://github.com/FirestormViewer/phoenix-firestorm

Ansariel 7185e97905 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llaudio/llaudiodecodemgr.cpp # indra/llaudio/llaudioengine.cpp # indra/llaudio/llaudioengine.h # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llrender/llrender.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/app_settings/settings.xml # indra/newview/llviewerwindow.cpp # indra/newview/pipeline.cpp		2022-06-15 10:38:52 +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 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer	2022-06-15 10:38:52 +02:00
scripts	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546	2022-05-26 11:43:21 +02: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	Update Havok	2022-06-03 20:26:02 +02:00
build.sh	…
build_target.sh	…