diff options
author | Sean Dague | 2008-10-15 21:00:08 +0000 |
---|---|---|
committer | Sean Dague | 2008-10-15 21:00:08 +0000 |
commit | ceb5830142f85ac24536d801d522da49411d64d5 (patch) | |
tree | b4500713b9e9e29f53151383fad5c02147d0cbd2 /OpenSim/Region/Environment/Modules/Grid | |
parent | Thanks, idb, for a patch that fixes Mantis#2400: (diff) | |
download | opensim-SC-ceb5830142f85ac24536d801d522da49411d64d5.zip opensim-SC-ceb5830142f85ac24536d801d522da49411d64d5.tar.gz opensim-SC-ceb5830142f85ac24536d801d522da49411d64d5.tar.bz2 opensim-SC-ceb5830142f85ac24536d801d522da49411d64d5.tar.xz |
clean up a merge conflict and remove a console message
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Grid')
0 files changed, 0 insertions, 0 deletions