diff options
author | Melanie | 2011-10-12 07:05:47 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 07:05:47 +0100 |
commit | 00285082d82a7a5b3d7a5e4f8f3ac6c56b431363 (patch) | |
tree | ed57db090dd909f59f11af628bed9ae0a0d85747 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
parent | Merge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmerge (diff) | |
parent | Fixed line endings from previous commit (diff) | |
download | opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.zip opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.gz opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.bz2 opensim-SC-00285082d82a7a5b3d7a5e4f8f3ac6c56b431363.tar.xz |
Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
0 files changed, 0 insertions, 0 deletions