Files
Ansariel 1aeffaf2e5 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/skins/default/xui/pt/floater_post_process.xml
#	indra/newview/skins/default/xui/pt/floater_sound_devices.xml
#	indra/newview/skins/default/xui/pt/floater_voice_effect.xml
#	indra/newview/skins/default/xui/pt/panel_login_first.xml
#	indra/newview/skins/default/xui/pt/panel_voice_effect.xml
2026-06-06 18:42:23 +02:00
..