diff options
| author | Melanie | 2010-01-16 00:05:08 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-16 00:05:08 +0000 |
| commit | 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch) | |
| tree | be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Data/Properties | |
| parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
| parent | Add "create user" instructions to README.txt (diff) | |
| download | opensim-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/Data/Properties')
0 files changed, 0 insertions, 0 deletions