Melanie 375114bea3 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-02-07 01:40:11 +00:00
..
BasicPhysicsPlugin	Bump version and assembly version numbers from 0.7.5 to 0.7.6	2013-02-05 00:23:17 +00:00
BulletSPlugin	Merge branch 'master' into careminster	2013-02-07 01:40:11 +00:00
ChOdePlugin	Merge branch 'master' into careminster	2012-11-30 01:54:13 +00:00
ConvexDecompositionDotNet	Bump version and assembly version numbers from 0.7.5 to 0.7.6	2013-02-05 00:23:17 +00:00
Manager	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
Meshing	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
OdePlugin	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
POSPlugin	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00
UbitMeshing	Merge branch 'master' into careminster	2013-02-06 02:22:12 +00:00
UbitOdePlugin	Merge branch 'master' into careminster	2013-02-05 21:30:12 +00:00