# 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 |
||
|---|---|---|
| .. | ||
| testplans | ||
| FS_PR_GUIDELINES.md | ||
| LGPL-license.txt | ||
| LICENSE-logos.txt | ||
| LICENSE-source.txt | ||
| building_linux.md | ||
| building_macos.md | ||
| building_windows.md | ||
| contributions.txt | ||
| firestorm_256.png | ||
| translations.txt | ||