diff options
author | Melanie | 2013-02-10 00:17:14 +0000 |
---|---|---|
committer | Melanie | 2013-02-10 00:17:14 +0000 |
commit | 069e587841465d8d041164929e27fc891b66a64a (patch) | |
tree | c37a59b837bfbac696850a7af2b8f20c520141ba /bin/lib32 | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.zip opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.gz opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.bz2 opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
Diffstat (limited to 'bin/lib32')
-rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 546304 -> 546816 bytes |
-rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1695269 -> 1695699 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index de4f95a..4dd2f38 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 674a08a..cb8742a 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
Binary files differ | |||