Melanie b970d4f976 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-12-22 16:37:25 +00:00
..
AssemblyInfo.cs	Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.	2009-06-01 06:37:14 +00:00
PhysXCharacter.cs	Remove unused SetAcceleration and add set on Acceleration parameter	2011-12-20 14:45:32 -08:00
PhysXPrim.cs	Remove unused SetAcceleration and add set on Acceleration parameter	2011-12-20 14:45:32 -08:00
PhysXScene.cs	Fix some local id issues in physics glue	2011-07-15 20:07:59 +01:00