aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2013-04-21 14:11:39 +0100
committerMelanie2013-04-21 14:11:39 +0100
commit231c298ca541331ab9c4d09702ea91c1754e23ef (patch)
treeec657ee17b9cffc55202ea492bf309608696450a /prebuild.xml
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.zip
opensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.tar.gz
opensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.tar.bz2
opensim-SC-231c298ca541331ab9c4d09702ea91c1754e23ef.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
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 16d7705..edf561e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1760,6 +1760,7 @@
1760 <Reference name="System.Xml"/> 1760 <Reference name="System.Xml"/>
1761 <Reference name="System.Drawing"/> 1761 <Reference name="System.Drawing"/>
1762 <Reference name="System.Web"/> 1762 <Reference name="System.Web"/>
1763 <Reference name="Ionic.Zip" path="../../../bin/"/>
1763 <Reference name="NDesk.Options" path="../../../bin/"/> 1764 <Reference name="NDesk.Options" path="../../../bin/"/>
1764 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1765 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1765 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 1766 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>