diff options
| author | Melanie | 2012-01-10 18:33:32 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-10 18:33:32 +0000 |
| commit | 1cc685e820b0b2979098f3a63d8e7dd532fc7c6f (patch) | |
| tree | 9d80fe3f7b9cf23aed9c97fdef37a706940d1f2c /OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-1cc685e820b0b2979098f3a63d8e7dd532fc7c6f.zip opensim-SC-1cc685e820b0b2979098f3a63d8e7dd532fc7c6f.tar.gz opensim-SC-1cc685e820b0b2979098f3a63d8e7dd532fc7c6f.tar.bz2 opensim-SC-1cc685e820b0b2979098f3a63d8e7dd532fc7c6f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeServer.py')
0 files changed, 0 insertions, 0 deletions