3 Commits (fdb7a804fcbcddec0e2f2edc15ad1ede1bfee2aa)

Author	SHA1	Message	Date
Diva Canto	254a1e0f98	Restoring ICSharpCode.SharpZipLib.dll to what it was before, as it seems to have been inadvertently replaced in commit edcba95ab5	2015-06-11 11:31:21 -07:00
Melanie Thielker	edcba95ab5	Merge branch 'master' into moses ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs	2015-05-20 23:40:52 +02:00
Diva Canto	b5bc5665a6	Updated Mono.Addins to version 1.2 (https://github.com/mono/mono-addins/releases/tag/mono-addins-1.2). Also included mautil.exe, the command line application for managing mono addins.	2014-12-29 14:38:18 -08:00