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. |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| slplugin.cpp | ||
| slplugin_info.plist | ||