Ansariel 193fb1627f Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewermedia.cpp		2024-09-19 23:04:19 +02:00
..
code_tools	…
content_tools	…
messages	…
metrics	…
perf	trailing spaces from other branches	2024-09-19 12:40:56 -04:00
templates	…
testing/lsl	…
configure_firestorm.sh	…
md5check.py	…
packages-formatter.py	…
setup-path.py	…
template_verifier.py	…