# Conflicts: # indra/llwindow/llwindow.cpp # indra/llwindow/llwindowmacosx.cpp # indra/llwindow/llwindowmacosx.h # indra/llwindow/llwindowwin32.cpp # indra/newview/app_settings/settings.xml # indra/newview/lltextureview.cpp # indra/newview/llviewerwindow.cpp |
||
|---|---|---|
| .. | ||
| build.yaml | ||
| build_viewer.yml | ||
| cla.yaml | ||
| label.yaml | ||
| pre-commit.yaml | ||
| stale.yaml | ||