Dan Lake 7447765f4d Merge branch 'master' into dev ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/Physics/OdePlugin/OdePlugin.cs		2011-07-15 15:32:42 -07:00
..
Compiler	…
Configger	…
LaunchSLClient	…
OpenSim.32BitLaunch	…
Robust.32BitLaunch	…
pCampBot	…
classaudit.pl	…