aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Permissions
diff options
context:
space:
mode:
authorMelanie2013-03-19 01:19:33 +0000
committerMelanie2013-03-19 01:19:33 +0000
commit566ab7ccf92c607fa06e38700c8094680eea704c (patch)
tree929770aca41391af0144e593c67e60beecc7af8a /OpenSim/Region/CoreModules/World/Permissions
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-566ab7ccf92c607fa06e38700c8094680eea704c.zip
opensim-SC-566ab7ccf92c607fa06e38700c8094680eea704c.tar.gz
opensim-SC-566ab7ccf92c607fa06e38700c8094680eea704c.tar.bz2
opensim-SC-566ab7ccf92c607fa06e38700c8094680eea704c.tar.xz
Fix merge artefacts
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
0 files changed, 0 insertions, 0 deletions