diff options
| author | Diva Canto | 2015-01-04 19:07:40 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-01-04 19:07:40 -0800 |
| commit | 502aa7bb1528f41b5d58219c300c41ba683a81eb (patch) | |
| tree | 805cdf5a785c48a8c4880099b4869f8376b0f22a /bin | |
| parent | Added overloaded LoadArchSpecificWindowsDll, to help addins load native libra... (diff) | |
| parent | Fix typo in OpenSim.ini.example (diff) | |
| download | opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.zip opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.gz opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.bz2 opensim-SC_OLD-502aa7bb1528f41b5d58219c300c41ba683a81eb.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 2 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 1337856 -> 1337344 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2310508 -> 2310500 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 1546752 -> 1546240 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2473989 -> 2473981 bytes |
5 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 343f83d..045fa88 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | ;# {PublicPort} {} {PublicPort} {8002} "8002" | 49 | ;# {PublicPort} {} {PublicPort} {8002} "8002" |
| 50 | PublicPort = "8002" | 50 | PublicPort = "8002" |
| 51 | 51 | ||
| 52 | ;# {PrivatePort} {} {PublicPort} {8003} "8003" | 52 | ;# {PrivatePort} {} {PrivatePort} {8003} "8003" |
| 53 | PrivatePort = "8003" | 53 | PrivatePort = "8003" |
| 54 | 54 | ||
| 55 | 55 | ||
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 7d60776..342ccdf 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 5c9255f..87ecf1d 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index fbfd76d..60b3a22 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index bd6b9a2..5959df0 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||