aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/HttpServer_OpenSim.xml
diff options
context:
space:
mode:
authorMelanie2012-01-26 23:07:31 +0000
committerMelanie2012-01-26 23:07:31 +0000
commit9d60b84f7805b78ae9413b4dc66c2fbbf387e503 (patch)
tree6aa89951925561a5dbe031b9a92e9dd49c0a272a /bin/HttpServer_OpenSim.xml
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.zip
opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.gz
opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.bz2
opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/EstateSettings.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions