diff options
author | Melanie | 2011-12-05 20:32:35 +0000 |
---|---|---|
committer | Melanie | 2011-12-05 20:32:35 +0000 |
commit | bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch) | |
tree | d0bc568f8b5eeb47ccd77c822e6941b0e150319c /prebuild.xml | |
parent | Add the proper result code as per the LL announcement for llTransferLindenDol... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2 opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz |
Merge branch 'master' into bigmerge
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 94f9217..f8cfdad 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2709,9 +2709,11 @@ | |||
2709 | <ReferencePath>../../../bin/</ReferencePath> | 2709 | <ReferencePath>../../../bin/</ReferencePath> |
2710 | <Reference name="System"/> | 2710 | <Reference name="System"/> |
2711 | <Reference name="System.Core"/> | 2711 | <Reference name="System.Core"/> |
2712 | <Reference name="System.Data"/> | ||
2712 | <Reference name="System.Drawing"/> | 2713 | <Reference name="System.Drawing"/> |
2713 | <Reference name="System.Xml"/> | 2714 | <Reference name="System.Xml"/> |
2714 | <Reference name="System.Data"/> | 2715 | <Reference name="System.Web"/> |
2716 | <Reference name="HttpServer_OpenSim" path="../../../bin/"/> | ||
2715 | <Reference name="log4net" path="../../../bin/"/> | 2717 | <Reference name="log4net" path="../../../bin/"/> |
2716 | <Reference name="Mono.Addins" path="../../../bin/"/> | 2718 | <Reference name="Mono.Addins" path="../../../bin/"/> |
2717 | <Reference name="Nini" path="../../../bin/"/> | 2719 | <Reference name="Nini" path="../../../bin/"/> |
@@ -2758,6 +2760,7 @@ | |||
2758 | </Files> | 2760 | </Files> |
2759 | </Project> | 2761 | </Project> |
2760 | 2762 | ||
2763 | |||
2761 | <Project frameworkVersion="v3_5" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library"> | 2764 | <Project frameworkVersion="v3_5" name="OpenSim.Data.Tests" path="OpenSim/Data/Tests" type="Library"> |
2762 | <Configuration name="Debug"> | 2765 | <Configuration name="Debug"> |
2763 | <Options> | 2766 | <Options> |