diff options
author | Melanie | 2011-10-25 03:07:25 +0100 |
---|---|---|
committer | Melanie | 2011-10-25 03:07:25 +0100 |
commit | 1bb0e3c800bdf72ae0e846cf74263e65d50931b8 (patch) | |
tree | edab91415612e4fa4cdca4ceffbc07feb4a7ecd3 /Prebuild | |
parent | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge (diff) | |
parent | on log and "show scripts" messages, show script item UUID rather than asset UUID (diff) | |
download | opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.zip opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.gz opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.bz2 opensim-SC_OLD-1bb0e3c800bdf72ae0e846cf74263e65d50931b8.tar.xz |
Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'Prebuild')
0 files changed, 0 insertions, 0 deletions