Melanie caa19862fa Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-03-07 00:51:59 +00:00

..

Application

Merge branch 'master' into careminster

2012-01-31 20:53:49 +00:00

ClientStack

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

2012-03-04 16:23:46 +00:00

CoreModules

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

DataSnapshot

Commenting out DataSnapShot message "Registering service discovery capability" for now.

2012-01-05 17:10:38 +00:00

Framework

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

OptionalModules

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

2012-03-07 00:51:24 +00:00

Physics

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

2012-03-07 00:51:24 +00:00

RegionCombinerModule

Merge branch 'master' into careminster

2011-12-18 10:49:45 +00:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

UserStatistics

Call Dispose() via using() on SqliteCommands in WebStatsModule after use.

2012-02-28 22:54:21 +00:00