69054ad134
Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs |
||
---|---|---|
.. | ||
Limit | ||
Properties | ||
XMPP | ||
GenericAsyncResult.cs | ||
IUserService.cs | ||
RestClient.cs |