# Conflicts: # indra/newview/app_settings/settings.xml |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llwebrtc.cpp | ||
| llwebrtc.h | ||
| llwebrtc_impl.h | ||
# Conflicts: # indra/newview/app_settings/settings.xml |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llwebrtc.cpp | ||
| llwebrtc.h | ||
| llwebrtc_impl.h | ||