Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge

Conflicts:
	OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
This commit is contained in:
Melanie
2011-10-12 07:09:41 +01:00
2 changed files with 6 additions and 5 deletions

View File

@@ -1907,6 +1907,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="Mono.Addins" path="../../../bin/"/>
<Reference name="System"/>
<Reference name="System.Core"/>
<Reference name="System.Xml"/>
<Reference name="OpenMetaverse" path="../../../bin/"/>
<Reference name="OpenMetaverseTypes" path="../../../bin/"/>