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

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

2013-02-28 21:20:07 +00:00

..

Implementation

Merge branch 'master' into careminster

2013-02-28 21:20:07 +00:00

Interface

Merge branch 'avination' into careminster

2013-01-24 23:25:38 +00:00

Runtime

Partial port of Avination's support for the new physics parameters.

2013-02-06 08:03:04 +00:00