Merge branch 'master' into moses

Browse Source

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

...

This commit is contained in:

Melanie Thielker

2015-05-20 23:40:52 +02:00

parent 946a6622fe d9afe354ac

commit edcba95ab5

3 changed files with 41 additions and 2 deletions

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

BIN

bin/ICSharpCode.SharpZipLib.dll

Binary file not shown.