Merge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge

Browse Source

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

...

This commit is contained in:

Melanie

2011-10-11 21:10:55 +01:00

parent c95c8ab246 a4cc5f628f

commit 859a804d59

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