OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim/Region/Framework
History
Melanie f3132c45d9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 		2012-03-31 02:18:02 +01:00
..
Interfaces Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
Scenes Merge branch 'master' into careminster 2012-03-31 02:18:02 +01:00
ModuleLoader.cs Merge branch 'master' into careminster-presence-refactor 2011-04-12 00:27:39 +01:00