Go to file
Ansariel cb10f3b149 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	doc/contributions.txt
#	indra/llcommon/threadsafeschedule.h
#	indra/llwindow/llwindowmacosx-objc.mm
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/llappdelegate-objc.mm
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llsettingsvo.cpp
#	indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
.github/workflows
…
doc Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-11 12:15:54 +01:00
etc
…
indra Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-11 12:15:54 +01:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-10-21 01:41:17 +02:00
.clang-format
…
.gitattributes
…
.gitignore ignore the compiled glsl files as these should not be in version control 2022-11-05 15:01:18 +00:00
.pre-commit-config.yaml
…
BuildParams
…
FIRESTORM-SOURCE_LICENSE_HEADER.txt
…
README_BUILD_FIRESTORM_LINUX.txt
…
README_BUILD_FIRESTORM_MACOSX.txt
…
README_BUILD_FIRESTORM_WINDOWS.txt
…
autobuild.xml Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-01 15:16:40 +01:00
build.sh
…
build_target.sh
…