Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-18 00:59:20 +01:00
66 changed files with 1121 additions and 595 deletions

View File

@@ -2801,6 +2801,28 @@
</Files>
</Project>
<Project frameworkVersion="v3_5" name="OpenSim.Tests" path="OpenSim/Tests" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../bin/</ReferencePath>
<Reference name="OpenSim.Framework"/>
<Reference name="Nini.dll" />
<Reference name="nunit.framework.dll" />
<Reference name="OpenSim" />
<Files>
<Match pattern="*.cs" recurse="false"/>
</Files>
</Project>
<Project frameworkVersion="v3_5" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library">
<Configuration name="Debug">
<Options>