lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
4002cd96a52eaefa94e1fe032c90826b5210bb9a
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