diff options
author | Melanie | 2012-02-16 00:38:04 +0000 |
---|---|---|
committer | Melanie | 2012-02-16 00:38:04 +0000 |
commit | 0c1074537b8a83e68861a6f1a37db68214153165 (patch) | |
tree | 99212d4dbc1bab4ea6e620fab6853c576667232e /bin | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
parent | Fix some logic mistakes where firstly osNpcCreate() without options was creat... (diff) | |
download | opensim-SC-0c1074537b8a83e68861a6f1a37db68214153165.zip opensim-SC-0c1074537b8a83e68861a6f1a37db68214153165.tar.gz opensim-SC-0c1074537b8a83e68861a6f1a37db68214153165.tar.bz2 opensim-SC-0c1074537b8a83e68861a6f1a37db68214153165.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions