diff options
author | Melanie | 2010-06-12 00:08:20 +0100 |
---|---|---|
committer | Melanie | 2010-06-12 00:08:20 +0100 |
commit | 836728e5ded245df7553b6a1b6c279d2e11ee370 (patch) | |
tree | d0ff3f9a5cc3747357f36aa09367c5d2eb8a7543 /OpenSim/Framework/MainServer.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-836728e5ded245df7553b6a1b6c279d2e11ee370.zip opensim-SC-836728e5ded245df7553b6a1b6c279d2e11ee370.tar.gz opensim-SC-836728e5ded245df7553b6a1b6c279d2e11ee370.tar.bz2 opensim-SC-836728e5ded245df7553b6a1b6c279d2e11ee370.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/MainServer.cs')
0 files changed, 0 insertions, 0 deletions