diff options
| author | Melanie | 2011-10-25 01:36:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:36:39 +0100 |
| commit | 8e69dde3979dbe2db91221b1a977d66a8cd9bd1d (patch) | |
| tree | 041ecc3514a8882335bd49c52be240b46dace55f /.gitignore | |
| parent | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge (diff) | |
| parent | When shutting down XEngine, log how many scripts are being shutdown so the us... (diff) | |
| download | opensim-SC-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.zip opensim-SC-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.tar.gz opensim-SC-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.tar.bz2 opensim-SC-8e69dde3979dbe2db91221b1a977d66a8cd9bd1d.tar.xz | |
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions