Go to file
Ansariel 4e87c96292 Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/newview/llfloater360capture.cpp
#	indra/newview/llperfstats.cpp
#	indra/newview/llperfstats.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/pipeline.cpp
2022-11-23 10:08:56 +01:00
.github Merge branch 'master' of https://github.com/secondlife/viewer 2022-11-21 20:37:32 +01:00
doc Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 2022-11-23 10:08:56 +01:00
etc
…
indra Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 2022-11-23 10:08:56 +01:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-25 11:49:36 +02:00
.clang-format
…
.gitattributes
…
.gitignore Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2022-11-23 10:02:57 +01:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-01-24 18:47:10 +02: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
LICENSE Renamed LICENSE.txt to follow naming scheme of other repos 2022-11-18 17:10:03 -05: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
…
autobuild.xml Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer 2022-11-23 10:08:56 +01:00
build.sh Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
build_target.sh
…