10f8c2ea9b
This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability. |
||
---|---|---|
.. | ||
Agent/InternetRelayClientView | ||
Avatar | ||
ContentManagementSystem | ||
Resources | ||
Scripting | ||
ServiceConnectorsIn/Freeswitch | ||
SvnSerialiser | ||
World | ||
README |
README
= OpenSim.Region.OptionalModules = The modules in this part of the OpenSim source tree are candidates for forge. For the time being, until we have reached consensus on (a) what should be core or optional (b) that we have reached a stable API (c) how to maintain optional modules we will keep these modules in-tree.