diff options
| author | Melanie | 2012-02-18 22:21:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-18 22:21:10 +0000 |
| commit | 985526b662f47404404281a3ef4a35afa607bfbf (patch) | |
| tree | cbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.zip opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2 opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lib32/ode.dll (renamed from bin/ode.dll) | bin | 496640 -> 496640 bytes |
| -rwxr-xr-x | bin/lib64/ode.dll | bin | 0 -> 656384 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/ode.dll b/bin/lib32/ode.dll index f310358..f310358 100755 --- a/bin/ode.dll +++ b/bin/lib32/ode.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll new file mode 100755 index 0000000..df3a6c4 --- /dev/null +++ b/bin/lib64/ode.dll | |||
| Binary files differ | |||