# Conflicts: # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llvoicewebrtc.cpp |
||
|---|---|---|
| .. | ||
| html | ||
| textures | ||
| themes/textures | ||
| xui | ||
| colors.xml | ||
| default_languages.xml | ||
| settings.xml | ||
| toolbars.xml | ||
# Conflicts: # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llvoicewebrtc.cpp |
||
|---|---|---|
| .. | ||
| html | ||
| textures | ||
| themes/textures | ||
| xui | ||
| colors.xml | ||
| default_languages.xml | ||
| settings.xml | ||
| toolbars.xml | ||