Melanie Thielker 159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs		2014-06-21 00:39:55 +02:00
..
Base	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster	2014-06-21 00:39:55 +02:00
Handlers	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster	2014-06-21 00:39:55 +02:00
Properties	Bump version and assembly version numbers from 0.7.5 to 0.7.6	2013-02-05 00:23:17 +00:00
ServerMain.cs	minor: log an error rather than info if a connector fails to load.	2013-03-15 22:08:11 +00:00