logue 2d2bf99d3b Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into jp-translation ... # Conflicts: # indra/newview/installers/windows/lang_ja.nsi # indra/newview/skins/default/xui/ja/menu_pie_object.xml # indra/newview/skins/default/xui/ja/notifications.xml # indra/newview/skins/default/xui/ja/panel_preferences_general.xml # indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml		2025-02-11 13:56:38 +09:00
..
code_tools	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm into jp-translation	2025-02-11 13:56:38 +09:00
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	…