Melanie 6a96c9546d Merge branch 'master' into bigmerge ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2011-10-26 17:48:51 +01:00
..
BasicPhysicsPlugin	extend move test to check one beat of the simulator without actually asking the npc to move.	2011-08-03 23:06:18 +01:00
BulletSPlugin	Remove unused fields from CollisionEventUpdate	2011-10-25 22:39:08 +01:00
ChOdePlugin	Merge branch 'master' into bigmerge	2011-10-26 17:48:51 +01:00
ConvexDecompositionDotNet	BulletSim initial checkin	2011-06-20 17:24:42 -07:00
Manager	Merge branch 'master' into bigmerge	2011-10-26 01:27:24 +01:00
Meshing	Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape	2011-08-28 16:50:54 -04:00
OdePlugin	Merge branch 'master' into bigmerge	2011-10-26 01:27:24 +01:00
POSPlugin	Fix some local id issues in physics glue	2011-07-15 20:07:59 +01:00
PhysXPlugin	Fix some local id issues in physics glue	2011-07-15 20:07:59 +01:00