aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
diff options
context:
space:
mode:
authorMelanie2012-02-19 21:14:18 +0000
committerMelanie2012-02-19 21:14:18 +0000
commit756baff86a751a96e485b218b21c472b704f430b (patch)
tree9e59a0b0df7f5ba2a9ab15a0d25fda6aa7fb4142 /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-756baff86a751a96e485b218b21c472b704f430b.zip
opensim-SC-756baff86a751a96e485b218b21c472b704f430b.tar.gz
opensim-SC-756baff86a751a96e485b218b21c472b704f430b.tar.bz2
opensim-SC-756baff86a751a96e485b218b21c472b704f430b.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-28 05:37:38 +0000