aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorMelanie2012-03-21 00:26:02 +0000
committerMelanie2012-03-21 00:26:02 +0000
commitee9210f656f754e2caa40cb6ff39463cbf286347 (patch)
tree8097bad8a37e210bfbdeff113a9ab00d853ad9ac /OpenSim/Framework/Servers
parentMerge branch 'master' into careminster (diff)
parentRefix the fixed fix! (diff)
downloadopensim-SC_OLD-ee9210f656f754e2caa40cb6ff39463cbf286347.zip
opensim-SC_OLD-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.gz
opensim-SC_OLD-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.bz2
opensim-SC_OLD-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
0 files changed, 0 insertions, 0 deletions