automated merge for viewer-2.0 -> avp.
--HG-- branch : avatar-pipeline
Showing
- indra/cmake/00-Common.cmake 4 additions, 4 deletionsindra/cmake/00-Common.cmake
- indra/cmake/Copy3rdPartyLibs.cmake 10 additions, 6 deletionsindra/cmake/Copy3rdPartyLibs.cmake
- indra/cmake/run_build_test.py 6 additions, 6 deletionsindra/cmake/run_build_test.py
- indra/llaudio/CMakeLists.txt 2 additions, 4 deletionsindra/llaudio/CMakeLists.txt
- indra/llaudio/llaudiodecodemgr.cpp 0 additions, 1 deletionindra/llaudio/llaudiodecodemgr.cpp
- indra/llplugin/llpluginclassmedia.cpp 2 additions, 0 deletionsindra/llplugin/llpluginclassmedia.cpp
- indra/llplugin/llpluginclassmedia.h 2 additions, 0 deletionsindra/llplugin/llpluginclassmedia.h
- indra/llplugin/llpluginclassmediaowner.h 2 additions, 0 deletionsindra/llplugin/llpluginclassmediaowner.h
- indra/llplugin/llplugininstance.cpp 2 additions, 0 deletionsindra/llplugin/llplugininstance.cpp
- indra/llplugin/llplugininstance.h 2 additions, 0 deletionsindra/llplugin/llplugininstance.h
- indra/llplugin/llpluginmessage.cpp 2 additions, 0 deletionsindra/llplugin/llpluginmessage.cpp
- indra/llplugin/llpluginmessage.h 2 additions, 0 deletionsindra/llplugin/llpluginmessage.h
- indra/llplugin/llpluginmessageclasses.h 2 additions, 0 deletionsindra/llplugin/llpluginmessageclasses.h
- indra/llplugin/llpluginmessagepipe.cpp 2 additions, 0 deletionsindra/llplugin/llpluginmessagepipe.cpp
- indra/llplugin/llpluginmessagepipe.h 2 additions, 0 deletionsindra/llplugin/llpluginmessagepipe.h
- indra/llplugin/llpluginprocesschild.cpp 2 additions, 0 deletionsindra/llplugin/llpluginprocesschild.cpp
- indra/llplugin/llpluginprocesschild.h 2 additions, 0 deletionsindra/llplugin/llpluginprocesschild.h
- indra/llplugin/llpluginprocessparent.cpp 2 additions, 0 deletionsindra/llplugin/llpluginprocessparent.cpp
- indra/llplugin/llpluginprocessparent.h 2 additions, 0 deletionsindra/llplugin/llpluginprocessparent.h
- indra/llplugin/llpluginsharedmemory.cpp 2 additions, 0 deletionsindra/llplugin/llpluginsharedmemory.cpp
Loading
Please register or sign in to comment