Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source

Conflicts:
	OpenSim/Region/Physics/OdePlugin/OdePlugin.cs

...

This commit is contained in:

Diva Canto

2010-06-19 09:02:36 -07:00

parent f0f684161e db046f1fba

commit 2b76dba593

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

Diff Content Not Available