diff options
| author | Melanie | 2012-04-18 20:09:52 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-18 20:09:52 +0100 |
| commit | 525b7593e877b7074a61c4fa15dfa543a6073fdc (patch) | |
| tree | 4855adf386caab9d947311d37e3241a727973fcf /OpenSim/Framework/EstateSettings.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-525b7593e877b7074a61c4fa15dfa543a6073fdc.zip opensim-SC_OLD-525b7593e877b7074a61c4fa15dfa543a6073fdc.tar.gz opensim-SC_OLD-525b7593e877b7074a61c4fa15dfa543a6073fdc.tar.bz2 opensim-SC_OLD-525b7593e877b7074a61c4fa15dfa543a6073fdc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
0 files changed, 0 insertions, 0 deletions