diff options
author | Melanie | 2011-10-12 07:09:41 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 07:09:41 +0100 |
commit | 3a290e581a738ea4cf7d0b8d9934398ff74af9a9 (patch) | |
tree | d15bc6ca4f256716b32e9b44f39409c7004bf0bb /OpenSim/Capabilities | |
parent | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge (diff) | |
parent | replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ... (diff) | |
download | opensim-SC-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.zip opensim-SC-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.tar.gz opensim-SC-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.tar.bz2 opensim-SC-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.tar.xz |
Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
Diffstat (limited to 'OpenSim/Capabilities')
0 files changed, 0 insertions, 0 deletions