Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-09-17 14:52:49 +02:00
commit 279c87d0f3
1 changed files with 2 additions and 2 deletions

View File

@ -1703,7 +1703,7 @@
<Reference name="OpenSim.Capabilities"/>
<Reference name="OpenSim.Capabilities.Handlers"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Monitoring"/>
<Reference name="OpenSim.Framework.Monitoring"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Framework.Console"/>
@ -1713,7 +1713,7 @@
<Reference name="Nini" path="../../../../../bin/"/>
<Reference name="log4net" path="../../../../../bin/"/>
<Reference name="Nini" path="../../../../../bin/"/>
<Reference name="zlib.net" path="../../../../bin/"/>
<Reference name="zlib.net" path="../../../../../bin/"/>
<Files>
<Match pattern="*.cs" recurse="true">