745845f799
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge. |
||
|---|---|---|
| .. | ||
| slplugin | ||
| CMakeLists.txt | ||
| llpluginclassmedia.cpp | ||
| llpluginclassmedia.h | ||
| llpluginclassmediaowner.h | ||
| llplugininstance.cpp | ||
| llplugininstance.h | ||
| llpluginmessage.cpp | ||
| llpluginmessage.h | ||
| llpluginmessageclasses.h | ||
| llpluginmessagepipe.cpp | ||
| llpluginmessagepipe.h | ||
| llpluginprocesschild.cpp | ||
| llpluginprocesschild.h | ||
| llpluginprocessparent.cpp | ||
| llpluginprocessparent.h | ||
| llpluginsharedmemory.cpp | ||
| llpluginsharedmemory.h | ||