# Conflicts: # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llvoicewebrtc.cpp |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llwebrtc.cpp | ||
| llwebrtc.h | ||
| llwebrtc_impl.h | ||
# Conflicts: # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llvoicewebrtc.cpp |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llwebrtc.cpp | ||
| llwebrtc.h | ||
| llwebrtc_impl.h | ||