# 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 |
||
|---|---|---|
| .. | ||
| ipc | ||
| util | ||
| __init__.py | ||