aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:09:41 +0100
committerMelanie2011-10-12 07:09:41 +0100
commit3a290e581a738ea4cf7d0b8d9934398ff74af9a9 (patch)
treed15bc6ca4f256716b32e9b44f39409c7004bf0bb /prebuild.xml
parentMerge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge (diff)
parentreplace List used by m_accessIP in RemoteAdminPlugin with the more efficient ... (diff)
downloadopensim-SC_OLD-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.zip
opensim-SC_OLD-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.tar.gz
opensim-SC_OLD-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.tar.bz2
opensim-SC_OLD-3a290e581a738ea4cf7d0b8d9934398ff74af9a9.tar.xz
Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge
Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index abd2fa0..3b4ea39 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1907,6 +1907,7 @@
1907 <ReferencePath>../../../bin/</ReferencePath> 1907 <ReferencePath>../../../bin/</ReferencePath>
1908 <Reference name="Mono.Addins" path="../../../bin/"/> 1908 <Reference name="Mono.Addins" path="../../../bin/"/>
1909 <Reference name="System"/> 1909 <Reference name="System"/>
1910 <Reference name="System.Core"/>
1910 <Reference name="System.Xml"/> 1911 <Reference name="System.Xml"/>
1911 <Reference name="OpenMetaverse" path="../../../bin/"/> 1912 <Reference name="OpenMetaverse" path="../../../bin/"/>
1912 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1913 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>