mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 08:53:53 +00:00
Ansariel
2ba4a164e2
# Conflicts: # autobuild.xml # indra/cmake/Python.cmake # indra/lib/python/indra/util/llmanifest.py # indra/lib/python/indra/util/test_win32_manifest.py # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcommon/llerror.cpp # indra/newview/llappviewer.cpp # indra/newview/lleventnotifier.cpp # indra/newview/llpanellandmarks.cpp # indra/newview/llpreviewanim.cpp # indra/newview/llpreviewanim.h # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/de/menu_place_add_button.xml # indra/newview/skins/default/xui/it/menu_place_add_button.xml # indra/newview/skins/default/xui/it/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ja/menu_place_add_button.xml # indra/newview/skins/default/xui/pl/menu_place_add_button.xml # indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ru/menu_place_add_button.xml # indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml # indra/newview/viewer_manifest.py