Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Browse Source

Conflicts:
	OpenSim/Region/Framework/Scenes/KeyframeMotion.cs

...

This commit is contained in:

Melanie

2012-02-26 15:15:47 +01:00

parent ac1e30156a 416f39a561

commit 356603fff9

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