diff options
| author | Melanie | 2012-10-26 21:47:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-26 21:47:41 +0100 |
| commit | f3f794a12292e2abfdaecaa68b87663f27619277 (patch) | |
| tree | 17db09a28875bd0da13112c9601ef140e5e96ebd /bin/lib32 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Separate LSL's notion of the default anim from the actually playing anims. (diff) | |
| download | opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.zip opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.tar.gz opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.tar.bz2 opensim-SC-f3f794a12292e2abfdaecaa68b87663f27619277.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/lib32')
0 files changed, 0 insertions, 0 deletions