aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
diff options
context:
space:
mode:
authorMelanie2011-11-01 23:54:09 +0000
committerMelanie2011-11-01 23:54:09 +0000
commitb69f679122fb7fdc0f77fc198e148f42797a2eef (patch)
treee06d4f4572a91a58c79c03c60b0fca5574467834 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
parentMerge branch 'master' into bigmerge (diff)
parentRemoved see_into_this_sim_from_neighbor configuration option. (diff)
downloadopensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip
opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz
opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2
opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-24 03:09:04 +0000