Go to file
Ansariel 2aceea66ff Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/newview/llfloateropenobject.cpp
#	indra/newview/llfloateropenobject.h
#	indra/newview/llmaterialmgr.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/skins/default/xui/en/floater_openobject.xml
2022-10-01 13:10:39 +02:00
.github/workflows updates for GHA to get windows to work. 2022-09-17 22:26:27 +01:00
doc Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-01 13:10:39 +02:00
etc
indra Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-01 13:10:39 +02:00
scripts Let's add this back, too 2022-09-25 13:25:15 +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-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
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 FMOD Studio on OSX with package built by Kitty 2022-09-26 14:44:49 +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