aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/MessageServerConfig.cs
diff options
context:
space:
mode:
authorMelanie2010-01-26 15:12:41 +0000
committerMelanie2010-01-26 15:12:41 +0000
commite9c9a74e0ade505ee8d8d8e7790141f758a65f61 (patch)
tree8aec3c51c714b0f2ec713880759cfd8f6a7cbcd3 /OpenSim/Framework/MessageServerConfig.cs
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.zip
opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.gz
opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.bz2
opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.xz
Some merge fixups
Diffstat (limited to 'OpenSim/Framework/MessageServerConfig.cs')
0 files changed, 0 insertions, 0 deletions