Go to file
Ansariel cf1f221c9f Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/skins/default/xui/en/floater_performance.xml
#	indra/newview/skins/default/xui/en/panel_performance_complexity.xml
#	indra/newview/skins/default/xui/en/panel_performance_huds.xml
#	indra/newview/skins/default/xui/en/panel_performance_preferences.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-04-20 16:57:24 +02:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 10:12:32 +01:00
etc Merge axon 2017-09-20 01:09:14 +02:00
indra Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer 2022-04-20 16:57:24 +02:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 10:12:32 +01:00
.clang-format DRTVWR-497 tweak clang-format rules for argument packing 2020-08-24 13:52:57 -06:00
.gitattributes More line ending normalization madness 2020-01-16 09:35:33 +01:00
.gitignore Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 10:12:32 +01:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-03-08 19:25:02 +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 tip to default branch. 2014-12-12 09:36:00 +01:00
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-04-20 16:02:17 +02:00
build.sh Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00