Melanie 7dad1ded2e Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs		2012-03-29 00:27:35 +01:00
..
OpenSim.Region.Physics.BulletSPlugin.dll.config	…
OpenSim.Region.Physics.UbitOdePlugin.dll.config	Fix UbitODE dll mappping by simply copying the one from ODE.Net	2012-03-09 02:39:02 +01:00