# Conflicts: # indra/llcommon/llcallstack.h # indra/llinventory/llsettingssky.cpp # indra/llmath/llvolume.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llmeshrepository.h # indra/newview/llviewerstats.cpp # indra/newview/llvoavatar.cpp |
||
|---|---|---|
| .. | ||
| build.yaml | ||
| build_viewer.yml | ||
| cla.yaml | ||
| label.yaml | ||