Go to file
Ansariel 63238d1fbe Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 19:19:48 +01:00
doc Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer 2022-02-02 10:37:33 +01:00
etc
indra Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-03-01 19:19:48 +01:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 08:38:19 +01:00
.clang-format DRTVWR-497 tweak clang-format rules for argument packing 2020-08-24 13:52:57 -06:00
.gitattributes
.gitignore FIRE-31326 - Fix crash thread contention crash 2022-01-30 15:48:16 +00:00
BuildParams Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt It's 2022... 2021-12-31 14:42:20 +01:00
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 Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +02:00
autobuild.xml Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
build.sh Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-09-20 13:16:41 +02:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00