ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-16 03:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
371c9dd2af01a2e7422ec901ee1f80757284a78c
opensim/OpenSim/Region/CoreModules/Scripting/LSLHttp
History
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
..
UrlModule.cs
Merge branch 'master' into careminster
2013-07-24 03:50:09 +01:00