aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2009-11-28 09:26:00 +0000
committerMelanie2009-11-28 09:26:00 +0000
commitd3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch)
tree044fde70d244eecd8c1344eb973aa8d6e86e249b /prebuild.xml
parentReset update flag when a SOG is deleted. This fixes llDie(); (diff)
parentAdd some conditionals to references to the WorldComm module, so that the (diff)
downloadopensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--prebuild.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml
index ad06938..9d428d1 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1684,8 +1684,6 @@
1684 <Reference name="OpenMetaverseTypes.dll"/> 1684 <Reference name="OpenMetaverseTypes.dll"/>
1685 <Reference name="OpenMetaverse.StructuredData.dll"/> 1685 <Reference name="OpenMetaverse.StructuredData.dll"/>
1686 <Reference name="OpenMetaverse.dll"/> 1686 <Reference name="OpenMetaverse.dll"/>
1687 <Reference name="IronPython.dll"/>
1688 <Reference name="IronMath.dll"/>
1689 <Reference name="PumaCode.SvnDotNet.dll"/> 1687 <Reference name="PumaCode.SvnDotNet.dll"/>
1690 <Reference name="OpenSim.Framework"/> 1688 <Reference name="OpenSim.Framework"/>
1691 <Reference name="OpenSim.Framework.Communications"/> 1689 <Reference name="OpenSim.Framework.Communications"/>