Melanie 4ccb15290e Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2014-01-28 20:47:36 +00:00
..
LoadRegions	Update an AssmblyVersion property that I missed to 0.8.0	2013-10-04 23:36:28 +01:00
RegionModulesController	Bump OPenSimulator version and assembly versions up to 0.8.0 Dev	2013-10-04 23:33:47 +01:00
RemoteController	Merge branch 'master' into careminster	2014-01-28 20:47:36 +00:00