diff options
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs')
0 files changed, 0 insertions, 0 deletions