Merge branch 'avination' into careminster

Browse Source

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs

...

This commit is contained in:

Melanie

2012-07-11 14:27:33 +01:00

parent 0bc8238a6c 6252114ea0

commit 89c9528e38

21 changed files with 738 additions and 392 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/libode.so Normal file → Executable file

Binary file not shown.

BIN

bin/lib32/ode.dll

Binary file not shown.