opensim/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs at 5000a5c038ddc2a8d5cd8cd46e9dcb9a0845faae

mirror of https://github.com/opensim/opensim.git synced 2026-08-28 01:25:41 +08:00

Files

Melanie a7eb1b5b85 Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2013-07-24 03:50:09 +01:00

11 KiB

Raw Blame History

View Raw

11 KiB Raw Blame History

11 KiB

Raw Blame History