Go to file
Ansariel 7c5671465e Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llaisapi.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-25 02:16:13 +02:00
.github Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-24 00:32:15 +02:00
doc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-08-25 01:19:32 +02:00
etc
…
fsutils
…
indra Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 2023-08-25 02:16:13 +02:00
scripts
…
.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 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 2023-07-29 14:35:11 +02:00
build.sh
…
build_target.sh
…
requirements.txt
…