diff options
| author | Melanie | 2013-01-19 02:38:04 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-19 02:38:04 +0000 |
| commit | 12efac494a6f55d85b778bf752a9b6c37c1b0ced (patch) | |
| tree | 4adec2a3f235f54e47a2216f7c9abaffdfac0c53 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Explicitly stop PollServiceRequestManager() rather than relying on its destru... (diff) | |
| download | opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.zip opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.gz opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.bz2 opensim-SC_OLD-12efac494a6f55d85b778bf752a9b6c37c1b0ced.tar.xz | |
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
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions