Merge branch 'master' into careminster

Browse Source

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Physics/Manager/PhysicsScene.cs

...

This commit is contained in:

Melanie

2012-08-01 23:03:03 +01:00

parent 8114260946 e36bc0d754

commit ecffcf7f65

13 changed files with 53 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

bin/lib32/BulletSim.dll

Binary file not shown.

BIN

bin/lib32/libBulletSim.so

Binary file not shown.

BIN

bin/lib64/BulletSim.dll

Binary file not shown.

BIN

bin/lib64/libBulletSim.so

Binary file not shown.