diff options
author | Melanie | 2011-02-07 23:07:36 +0000 |
---|---|---|
committer | Melanie | 2011-02-07 23:07:36 +0000 |
commit | 076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0 (patch) | |
tree | d6d80e7364bd96b95dddfbf03b708e2ea6ba3f77 /OpenSim/Framework/NetworkServersInfo.cs | |
parent | Fix merge issues (diff) | |
parent | Hunting down mantis #5365 (diff) | |
download | opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.zip opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.gz opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.bz2 opensim-SC-076f2ac8dbfa3dae31961ceadc41f4c0319f1fb0.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/NetworkServersInfo.cs')
0 files changed, 0 insertions, 0 deletions