Go to file
Ansariel ed67ca001c Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-09 11:05:56 +02:00
.github Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-09 10:36:35 +02:00
doc Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-18 11:17:02 +02:00
etc
fsutils
indra Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-09 11:05:56 +02:00
scripts Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-19 10:27:16 +02:00
.clang-format
.gitattributes
.gitignore
.pre-commit-config.yaml
BuildParams
FIRESTORM-SOURCE_LICENSE_HEADER.txt
LICENSE
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 2023-06-27 12:21:43 +02:00
build.sh
build_target.sh
requirements.txt remove commented out old cruft from requirements.txt 2023-07-10 00:24:54 +01:00