ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-08 13:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f
opensim/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
Melanie 12efac494a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
2013-01-19 02:38:04 +00:00

15 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink