aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2009-10-15 21:14:13 +0100
committerMelanie2009-10-15 21:14:13 +0100
commit6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch)
treeffa84d5963afbb5390b132278c95df20b21681d5 /prebuild.xml
parentMerge branch 'master' into vehicles (diff)
parentMerge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff)
downloadopensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip
opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz
opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2
opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index bba54f3..1a491a7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -135,6 +135,7 @@
135 <Reference name="System.Xml"/> 135 <Reference name="System.Xml"/>
136 <Reference name="System.Data"/> 136 <Reference name="System.Data"/>
137 <Reference name="System.Drawing"/> 137 <Reference name="System.Drawing"/>
138 <Reference name="BclExtras.dll"/>
138 <Reference name="OpenMetaverseTypes.dll"/> 139 <Reference name="OpenMetaverseTypes.dll"/>
139 <Reference name="OpenMetaverse.dll"/> 140 <Reference name="OpenMetaverse.dll"/>
140 <Reference name="OpenMetaverse.StructuredData.dll"/> 141 <Reference name="OpenMetaverse.StructuredData.dll"/>
@@ -1767,6 +1768,7 @@
1767 <Reference name="OpenSim.Region.Communications.Local"/> 1768 <Reference name="OpenSim.Region.Communications.Local"/>
1768 <Reference name="OpenSim.Region.Physics.Manager"/> 1769 <Reference name="OpenSim.Region.Physics.Manager"/>
1769 <Reference name="OpenSim.Services.Interfaces"/> 1770 <Reference name="OpenSim.Services.Interfaces"/>
1771 <Reference name="BclExtras.dll"/>
1770 <Reference name="XMLRPC.dll"/> 1772 <Reference name="XMLRPC.dll"/>
1771 <Reference name="Nini.dll" /> 1773 <Reference name="Nini.dll" />
1772 <Reference name="log4net.dll"/> 1774 <Reference name="log4net.dll"/>
@@ -3495,7 +3497,6 @@
3495 <Reference name="OpenSim.Tests.Common"/> 3497 <Reference name="OpenSim.Tests.Common"/>
3496 <Reference name="OpenSim.Framework"/> 3498 <Reference name="OpenSim.Framework"/>
3497 <Reference name="OpenSim.Framework.Serialization"/> 3499 <Reference name="OpenSim.Framework.Serialization"/>
3498 <Reference name="OpenSim.Framework.Serialization.External"/>
3499 <Reference name="log4net.dll"/> 3500 <Reference name="log4net.dll"/>
3500 <Reference name="nunit.framework.dll" /> 3501 <Reference name="nunit.framework.dll" />
3501 3502