aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigSettings.cs
diff options
context:
space:
mode:
authormeta72010-08-10 09:11:55 -0700
committermeta72010-08-10 09:11:55 -0700
commit9fba4b66bbfe27d104f1d00a9591343dc9998d33 (patch)
tree56aaf9aa7092feda4725bb413637baf0ba8c5b36 /OpenSim/Framework/ConfigSettings.cs
parentAdd a stack trace to the error output on the recursive read lock warning on m... (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
downloadopensim-SC-9fba4b66bbfe27d104f1d00a9591343dc9998d33.zip
opensim-SC-9fba4b66bbfe27d104f1d00a9591343dc9998d33.tar.gz
opensim-SC-9fba4b66bbfe27d104f1d00a9591343dc9998d33.tar.bz2
opensim-SC-9fba4b66bbfe27d104f1d00a9591343dc9998d33.tar.xz
Resolve merge failure
Diffstat (limited to 'OpenSim/Framework/ConfigSettings.cs')
0 files changed, 0 insertions, 0 deletions