diff options
| author | Melanie | 2011-10-25 01:50:55 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:50:55 +0100 |
| commit | 69b480770aa93a03d5e7d463e3497859b0a1f593 (patch) | |
| tree | e8646e991a57183f251f106621e4917e62387834 /bin/Iesi.Collections.dll | |
| parent | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge (diff) | |
| parent | Don't execute rest of code in XEngine.RemoveRegion() and Close() if the modul... (diff) | |
| download | opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.zip opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.tar.gz opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.tar.bz2 opensim-SC-69b480770aa93a03d5e7d463e3497859b0a1f593.tar.xz | |
Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'bin/Iesi.Collections.dll')
0 files changed, 0 insertions, 0 deletions