aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigurationOption.cs
diff options
context:
space:
mode:
authorMelanie2012-06-13 02:15:12 +0100
committerMelanie2012-06-13 02:15:12 +0100
commit12621201ba5751282f623fa3a7851c546976e47c (patch)
treec5a1d99983c959c809966253b107e594a412042d /OpenSim/Framework/ConfigurationOption.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-12621201ba5751282f623fa3a7851c546976e47c.zip
opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.gz
opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.bz2
opensim-SC-12621201ba5751282f623fa3a7851c546976e47c.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
Diffstat (limited to 'OpenSim/Framework/ConfigurationOption.cs')
0 files changed, 0 insertions, 0 deletions