diff options
| author | Melanie | 2010-04-05 19:42:15 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-05 19:42:15 +0100 |
| commit | 2fbbc13c71052e66269035031e894b736e2ead5d (patch) | |
| tree | 35640748cd9817bf26de2c806065a8102736585d /OpenSim/Framework/EstateSettings.cs | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| download | opensim-SC_OLD-2fbbc13c71052e66269035031e894b736e2ead5d.zip opensim-SC_OLD-2fbbc13c71052e66269035031e894b736e2ead5d.tar.gz opensim-SC_OLD-2fbbc13c71052e66269035031e894b736e2ead5d.tar.bz2 opensim-SC_OLD-2fbbc13c71052e66269035031e894b736e2ead5d.tar.xz | |
Fix some overlooked merge conflicts that got committed
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
0 files changed, 0 insertions, 0 deletions