aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2011-01-13 19:53:44 +0000
committerMelanie2011-01-13 19:53:44 +0000
commit3fc5b6a8ec82332c59ac49ee8973a1752f7a2163 (patch)
treec48a4ed0ee413633507065427328fa8f98b5b782 /prebuild.xml
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMake FireAndForgetWrapper a singleton class (diff)
downloadopensim-SC_OLD-3fc5b6a8ec82332c59ac49ee8973a1752f7a2163.zip
opensim-SC_OLD-3fc5b6a8ec82332c59ac49ee8973a1752f7a2163.tar.gz
opensim-SC_OLD-3fc5b6a8ec82332c59ac49ee8973a1752f7a2163.tar.bz2
opensim-SC_OLD-3fc5b6a8ec82332c59ac49ee8973a1752f7a2163.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 380e98b..5825655 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -158,7 +158,6 @@
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="BclExtras35" path="../../bin/"/>
162 <Reference name="OpenMetaverseTypes" path="../../bin/"/> 161 <Reference name="OpenMetaverseTypes" path="../../bin/"/>
163 <Reference name="OpenMetaverse" path="../../bin/"/> 162 <Reference name="OpenMetaverse" path="../../bin/"/>
164 <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/> 163 <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/>
@@ -1628,7 +1627,6 @@
1628 <Reference name="OpenSim.Region.ClientStack"/> 1627 <Reference name="OpenSim.Region.ClientStack"/>
1629 <Reference name="OpenSim.Region.Physics.Manager"/> 1628 <Reference name="OpenSim.Region.Physics.Manager"/>
1630 <Reference name="OpenSim.Services.Interfaces"/> 1629 <Reference name="OpenSim.Services.Interfaces"/>
1631 <Reference name="BclExtras35" path="../../../../bin/"/>
1632 <Reference name="XMLRPC" path="../../../../bin/"/> 1630 <Reference name="XMLRPC" path="../../../../bin/"/>
1633 <Reference name="Nini" path="../../../../bin/"/> 1631 <Reference name="Nini" path="../../../../bin/"/>
1634 <Reference name="log4net" path="../../../../bin/"/> 1632 <Reference name="log4net" path="../../../../bin/"/>