diff options
| author | Melanie | 2012-12-04 23:01:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-04 23:01:18 +0000 |
| commit | 5837e731bfbd7ceafbd45aaf61c566440b25bf7e (patch) | |
| tree | 8ab9e0a345d5c5f281dc0b59085195f03126da12 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Bug fix in OfflineMessageModule. Mantis #6446 (diff) | |
| download | opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.zip opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.gz opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.bz2 opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
0 files changed, 0 insertions, 0 deletions