Conflicts: indra/newview/llfloaterperformance.cpp indra/newview/llfloaterpreference.cpp indra/newview/llfloaterpreferencesgraphicsadvanced.cpp indra/newview/llnamelistctrl.cpp indra/newview/llnamelistctrl.h indra/newview/llviewermenu.cpp indra/newview/llvoavatar.cpp indra/newview/llvoavatar.h indra/newview/skins/default/colors.xml indra/newview/skins/default/xui/en/menu_attachment_other.xml indra/newview/skins/default/xui/en/menu_avatar_other.xml indra/newview/skins/default/xui/en/strings.xml |
||
|---|---|---|
| debian | ||
| doc | ||
| etc | ||
| indra | ||
| scripts | ||
| .clang-format | ||
| .gitattributes | ||
| .gitignore | ||
| BuildParams | ||
| FIRESTORM-SOURCE_LICENSE_HEADER.txt | ||
| README_BUILD_FIRESTORM_LINUX.txt | ||
| README_BUILD_FIRESTORM_MACOSX.txt | ||
| README_BUILD_FIRESTORM_WINDOWS.txt | ||
| autobuild.xml | ||
| build.sh | ||
| build_target.sh | ||