merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Browse Source

Conflicts:
	bin/Regions/Regions.ini.example
	bin/lib32/BulletSim.dll
	bin/lib32/libBulletSim.so
	bin/lib64/BulletSim.dll
	bin/lib64/libBulletSim.so

...

This commit is contained in:

ubit

2012-08-02 18:21:08 +02:00

parent 3d68d1deda ecffcf7f65

commit 254d3e1ad3

101 changed files with 3570 additions and 1367 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.