Commit Graph

2 Commits (7effd3b1584ec132a8ffa75f8769a010b2021279)

Author SHA1 Message Date
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