Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-11-22 13:37:27 +00:00
13 changed files with 599 additions and 700 deletions

View File

@@ -446,6 +446,7 @@
<Reference name="XMLRPC" path="../../../bin/"/>
<Reference name="log4net" path="../../../bin/"/>
<Reference name="HttpServer_OpenSim" path="../../../bin/"/>
<Reference name="Nini" path="../../../bin/"/>
<Files>
<Match pattern="*.cs" recurse="false">