Fork of https://github.com/FirestormViewer/phoenix-firestorm

Ansariel c2484ffb36 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/skins/default/xui/en/floater_emoji_picker.xml		2023-07-13 10:24:51 +02:00
.github	Tweak to ensure best match is picked up.	2023-06-27 17:27:59 +01:00
doc	…
etc	…
fsutils	…
indra	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer	2023-07-13 10:24:51 +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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-07-13 09:22:50 +02:00
build.sh	…
build_target.sh	…
config_32_p.cmd	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer	2023-07-13 10:24:51 +02:00
requirements.txt	remove commented out old cruft from requirements.txt	2023-07-10 00:24:54 +01:00