diff options
author | Melanie | 2012-02-03 00:05:59 +0000 |
---|---|---|
committer | Melanie | 2012-02-03 00:05:59 +0000 |
commit | 573a64ad246fb7052b8bfbf6004f4926c853a0a0 (patch) | |
tree | 1a597257247834df8c34e1752ba47a96351a2f16 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix test failure (diff) | |
download | opensim-SC-573a64ad246fb7052b8bfbf6004f4926c853a0a0.zip opensim-SC-573a64ad246fb7052b8bfbf6004f4926c853a0a0.tar.gz opensim-SC-573a64ad246fb7052b8bfbf6004f4926c853a0a0.tar.bz2 opensim-SC-573a64ad246fb7052b8bfbf6004f4926c853a0a0.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
0 files changed, 0 insertions, 0 deletions