Melanie 56b2bc7101 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Physics/Manager/IMesher.cs

2012-11-30 01:54:13 +00:00

..

BasicPhysicsPlugin

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

BulletSPlugin

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00

ChOdePlugin

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00

ConvexDecompositionDotNet

Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.

2012-11-13 19:26:43 -08:00

Manager

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00

Meshing

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00

OdePlugin

Merge branch 'master' into careminster

2012-11-30 01:19:08 +00:00

POSPlugin

Merge branch 'master' into careminster

2012-11-15 00:43:26 +00:00

UbitMeshing

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00

UbitOdePlugin

Merge branch 'master' into careminster

2012-11-30 01:54:13 +00:00