aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
diff options
context:
space:
mode:
authorMelanie2011-12-05 19:08:19 +0000
committerMelanie2011-12-05 19:08:19 +0000
commit1ece4feccd1cf5bb04dbddfe78586d1b67716a7a (patch)
tree15317edd90ee91ee76aa282013ed4f4e5b2ca086 /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
parentMerge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.zip
opensim-SC-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.tar.gz
opensim-SC-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.tar.bz2
opensim-SC-1ece4feccd1cf5bb04dbddfe78586d1b67716a7a.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-22 13:49:24 +0000