mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 08:53:53 +00:00
# Conflicts: # indra/llaudio/llaudioengine_openal.cpp # indra/llui/lltextbox.h # indra/newview/llnotificationhandlerutil.cpp # indra/newview/llviewertexture.cpp # indra/newview/skins/default/xui/de/strings.xml # indra/newview/skins/default/xui/es/strings.xml # indra/newview/skins/default/xui/fr/strings.xml # indra/newview/skins/default/xui/it/strings.xml # indra/newview/skins/default/xui/pl/strings.xml # indra/newview/skins/default/xui/pt/strings.xml # indra/newview/skins/default/xui/ru/strings.xml # indra/newview/skins/default/xui/tr/strings.xml