Merge branch 'avination-current'

Browse Source

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

...

This commit is contained in:

Melanie Thielker

2014-11-10 20:22:49 +01:00

parent 64deb6ae6f 1d4355bd73

commit 9516ebac24

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