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

..

Tests

Include ChOdePlugin

2009-12-22 00:20:04 -05:00

AssemblyInfo.cs

Include ChOdePlugin

2009-12-22 00:20:04 -05:00

drawstuff.cs

Include ChOdePlugin

2009-12-22 00:20:04 -05:00

ODECharacter.cs

Merge branch 'master' into bigmerge

2011-10-26 17:48:51 +01:00

OdePhysicsJoint.cs

Include ChOdePlugin

2009-12-22 00:20:04 -05:00

OdePlugin.cs

Fox some local id issues in physics glue

2011-07-15 19:36:00 +02:00

ODEPrim.cs

Merge branch 'master' into bigmerge

2011-10-26 17:48:51 +01:00

ODERayCastRequestManager.cs

Fix a raycast issue

2011-07-15 11:12:10 -07:00