aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
diff options
context:
space:
mode:
authorMelanie2010-01-16 00:05:08 +0000
committerMelanie2010-01-16 00:05:08 +0000
commit10f8c2ea9b67158c32b361f9652d503ea48de292 (patch)
treebe0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
parentAdd "create user" instructions to README.txt (diff)
downloadopensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip
opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz
opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2
opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'OpenSim/Grid/Manager/OpenGridServices.Manager/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-20 20:49:04 +0000