aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
diff options
context:
space:
mode:
authorMelanie2013-04-21 14:11:39 +0100
committerMelanie2013-04-21 14:11:39 +0100
commit231c298ca541331ab9c4d09702ea91c1754e23ef (patch)
treeec657ee17b9cffc55202ea492bf309608696450a /OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.zip
opensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.tar.gz
opensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.tar.bz2
opensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2025-01-11 04:06:27 +0000