# Conflicts: # indra/newview/gltf/primitive.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltinygltfhelper.cpp # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvovolume.cpp |
||
|---|---|---|
| .. | ||
| testplans | ||
| LGPL-license.txt | ||
| LICENSE-logos.txt | ||
| LICENSE-source.txt | ||
| building_linux.md | ||
| building_macos.md | ||
| building_windows.md | ||
| contributions.txt | ||
| firestorm_256.png | ||
| translations.txt | ||