Merge commit '572b680cb01a856f860b1e3fb40a7153a36113f2' into bigmerge

Browse Source

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

avinationmerge

Melanie 2011-10-11 22:33:53 +01:00

parent 67e7f25d6c 572b680cb0

commit e3450da66c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available