diff options
| author | Melanie | 2012-01-26 00:44:32 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 00:44:32 +0000 |
| commit | 36e6edfc65d2fa2b27d473234ee2d22c73cdc58a (patch) | |
| tree | 4f8efc72b27ab16d5d86c0ca73f4a51c4c9128a0 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Re-enable error logging associated with assembly and script loading failure i... (diff) | |
| download | opensim-SC-36e6edfc65d2fa2b27d473234ee2d22c73cdc58a.zip opensim-SC-36e6edfc65d2fa2b27d473234ee2d22c73cdc58a.tar.gz opensim-SC-36e6edfc65d2fa2b27d473234ee2d22c73cdc58a.tar.bz2 opensim-SC-36e6edfc65d2fa2b27d473234ee2d22c73cdc58a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
0 files changed, 0 insertions, 0 deletions