diff options
author | Melanie | 2011-10-25 03:06:18 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 03:06:18 +0100 |
commit | 1ec82bb000db9ca76969638504030d6ec69f51e3 (patch) | |
tree | a7070c778ba8071eb98be34b7dd38536143e4b0e /.gitignore | |
parent | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge (diff) | |
parent | add current script status to "scripts show" command (running, suspended, etc.) (diff) | |
download | opensim-SC_OLD-1ec82bb000db9ca76969638504030d6ec69f51e3.zip opensim-SC_OLD-1ec82bb000db9ca76969638504030d6ec69f51e3.tar.gz opensim-SC_OLD-1ec82bb000db9ca76969638504030d6ec69f51e3.tar.bz2 opensim-SC_OLD-1ec82bb000db9ca76969638504030d6ec69f51e3.tar.xz |
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions