mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 00:48:30 +00:00
# Conflicts: # indra/cmake/Boost.cmake # indra/llxml/llcontrol.cpp # indra/newview/llcallingcard.cpp # indra/newview/lleventpoll.cpp # indra/newview/llviewermessage.cpp # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/viewer_manifest.py