diff options
| author | Melanie | 2011-11-06 20:12:57 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-06 20:12:57 +0000 |
| commit | 51bad0f8aecd069402d418c76bf943110c45e56c (patch) | |
| tree | 791d01b398bb7c13454d4598e4f46b627dd830be /OpenSim/Data | |
| parent | Break out the parts of ScenePresence that differ from core (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.zip opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.gz opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.bz2 opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Data')
0 files changed, 0 insertions, 0 deletions