aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2010-03-06 12:37:24 +0000
committerMelanie2010-03-06 12:37:24 +0000
commit8180c72cbc9cafff247d614ac14db29499fc32a9 (patch)
treefd92204394e657b805e094a237ffecaf50066df6 /prebuild.xml
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-8180c72cbc9cafff247d614ac14db29499fc32a9.zip
opensim-SC_OLD-8180c72cbc9cafff247d614ac14db29499fc32a9.tar.gz
opensim-SC_OLD-8180c72cbc9cafff247d614ac14db29499fc32a9.tar.bz2
opensim-SC_OLD-8180c72cbc9cafff247d614ac14db29499fc32a9.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml
index dab3512..6850b50 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -158,7 +158,7 @@
158 <Reference name="System.Data"/> 158 <Reference name="System.Data"/>
159 <Reference name="System.Drawing"/> 159 <Reference name="System.Drawing"/>
160 <Reference name="System.Web"/> 160 <Reference name="System.Web"/>
161 <Reference name="BclExtras.dll"/> 161 <Reference name="BclExtras35.dll"/>
162 <Reference name="OpenMetaverseTypes.dll"/> 162 <Reference name="OpenMetaverseTypes.dll"/>
163 <Reference name="OpenMetaverse.dll"/> 163 <Reference name="OpenMetaverse.dll"/>
164 <Reference name="OpenMetaverse.StructuredData.dll"/> 164 <Reference name="OpenMetaverse.StructuredData.dll"/>
@@ -1635,7 +1635,7 @@
1635 <Reference name="OpenSim.Region.ClientStack"/> 1635 <Reference name="OpenSim.Region.ClientStack"/>
1636 <Reference name="OpenSim.Region.Physics.Manager"/> 1636 <Reference name="OpenSim.Region.Physics.Manager"/>
1637 <Reference name="OpenSim.Services.Interfaces"/> 1637 <Reference name="OpenSim.Services.Interfaces"/>
1638 <Reference name="BclExtras.dll"/> 1638 <Reference name="BclExtras35.dll"/>
1639 <Reference name="XMLRPC.dll"/> 1639 <Reference name="XMLRPC.dll"/>
1640 <Reference name="Nini.dll" /> 1640 <Reference name="Nini.dll" />
1641 <Reference name="log4net.dll"/> 1641 <Reference name="log4net.dll"/>