diff options
| author | Melanie | 2009-09-28 22:57:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-28 22:57:38 +0100 |
| commit | fe3760e4a2b130a46f2439d9a258255c155f6042 (patch) | |
| tree | 6f895e9a28c351a83318af66c6b7da55750f826c /OpenSim/Framework/EstateSettings.cs | |
| parent | Bump version number in post-fixes (diff) | |
| parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
| download | opensim-SC-fe3760e4a2b130a46f2439d9a258255c155f6042.zip opensim-SC-fe3760e4a2b130a46f2439d9a258255c155f6042.tar.gz opensim-SC-fe3760e4a2b130a46f2439d9a258255c155f6042.tar.bz2 opensim-SC-fe3760e4a2b130a46f2439d9a258255c155f6042.tar.xz | |
Merge branch 'master' into 0.6.7-post-fixes
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
0 files changed, 0 insertions, 0 deletions