Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-17 18:21:35 +00:00
5 changed files with 61 additions and 12 deletions

View File

@@ -1244,6 +1244,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Core"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Capabilities"/>
<Reference name="OpenSim.Framework.Console"/>