# Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llmath/llvolume.cpp # indra/llmessage/llcorehttputil.cpp # indra/llrender/llgl.cpp # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llfloater360capture.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llviewertexture.cpp # indra/newview/viewer_manifest.py |
||
|---|---|---|
| .. | ||
| code_tools | ||
| content_tools | ||
| messages | ||
| metrics | ||
| perf | ||
| templates | ||
| testing/lsl | ||
| configure_firestorm.sh | ||
| md5check.py | ||
| packages-formatter.py | ||
| setup-path.py | ||
| template_verifier.py | ||