diff options
| author | Melanie | 2012-06-15 02:52:56 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-15 02:52:56 +0100 |
| commit | ca4e6d9b5b408d31d5778578cf41d1c77198287f (patch) | |
| tree | 2348d8a79ce819e3adbdf54fd0458a4d0ed7091d /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752 (diff) | |
| download | opensim-SC-ca4e6d9b5b408d31d5778578cf41d1c77198287f.zip opensim-SC-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.gz opensim-SC-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.bz2 opensim-SC-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
0 files changed, 0 insertions, 0 deletions