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

..

AssetService

Merge branch 'master' into careminster

2013-10-06 18:32:20 +01:00

AuthenticationService

Merge branch 'master' into careminster

2013-10-06 18:32:20 +01:00

AuthorizationService

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

AvatarService

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

Base

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

Connectors

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

FreeswitchService

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

Friends

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

GridService

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

HypergridService

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

Interfaces

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

InventoryService

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

LLLoginService

Intermediate commit. Sill errors.

2014-01-05 20:12:32 +00:00

MapImageService

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

PresenceService

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

UserAccountService

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

UserProfilesService

Remove the core module extra profile settings support carried in with the latest

2014-01-05 21:16:30 +00:00