diff options
| author | Melanie | 2011-11-07 02:41:56 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-07 02:41:56 +0000 |
| commit | adbc69bb0780300d9a83b8bc3c913d91a8153ec1 (patch) | |
| tree | 71038a37d63debd975c1928b153addd819291e64 /bin/assets | |
| parent | Fix up failing test to compensate for changed sit target offset (diff) | |
| parent | That such a trivial change can be so difficult to get right. Fix it this time. (diff) | |
| download | opensim-SC-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.zip opensim-SC-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.tar.gz opensim-SC-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.tar.bz2 opensim-SC-adbc69bb0780300d9a83b8bc3c913d91a8153ec1.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions