aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigSettings.cs
diff options
context:
space:
mode:
authorTom2011-09-04 07:38:25 -0700
committerTom2011-09-04 07:38:25 -0700
commit9ab951a954ff85371dc3dd92563d7c8cdefb7c20 (patch)
treec7e533bee1f871cdf391919c817779e942fe758c /OpenSim/Framework/ConfigSettings.cs
parentResolve merge commits, stage 1 (diff)
downloadopensim-SC-9ab951a954ff85371dc3dd92563d7c8cdefb7c20.zip
opensim-SC-9ab951a954ff85371dc3dd92563d7c8cdefb7c20.tar.gz
opensim-SC-9ab951a954ff85371dc3dd92563d7c8cdefb7c20.tar.bz2
opensim-SC-9ab951a954ff85371dc3dd92563d7c8cdefb7c20.tar.xz
I fucked up the merge for SOG, so reverting back to OpenSim Core's version...
Diffstat (limited to 'OpenSim/Framework/ConfigSettings.cs')
0 files changed, 0 insertions, 0 deletions