mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 00:48:30 +00:00
# Conflicts: # indra/llrender/llfontgl.cpp # indra/llrender/llrender.cpp # indra/llui/llbutton.h # indra/llui/llscrolllistctrl.cpp # indra/llui/llscrolllistctrl.h # indra/newview/llhudtext.h # indra/newview/llinventorymodelbackgroundfetch.cpp # indra/newview/llviewermenu.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml