diff options
author | Melanie | 2013-06-23 01:49:45 +0100 |
---|---|---|
committer | Melanie | 2013-06-23 01:49:45 +0100 |
commit | 936700bda3969bc54166f0d6a3ca81e3d5c42935 (patch) | |
tree | 6bb97abf25f4a3f22ccb40e3b4be20c551327b09 /prebuild.xml | |
parent | Fix prim locking to behave like SL (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.zip opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.gz opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.bz2 opensim-SC_OLD-936700bda3969bc54166f0d6a3ca81e3d5c42935.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 88db6ed..4cf3b83 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -157,6 +157,7 @@ | |||
157 | <Reference name="System"/> | 157 | <Reference name="System"/> |
158 | <Reference name="System.Core"/> | 158 | <Reference name="System.Core"/> |
159 | <Reference name="log4net" path="../../../bin/"/> | 159 | <Reference name="log4net" path="../../../bin/"/> |
160 | <Reference name="Nini" path="../../../bin/"/> | ||
160 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 161 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
161 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 162 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
162 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 163 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
@@ -744,6 +745,7 @@ | |||
744 | <Reference name="Mono.Addins.Setup" path="../../../bin/"/> | 745 | <Reference name="Mono.Addins.Setup" path="../../../bin/"/> |
745 | <Reference name="OpenSim.Framework"/> | 746 | <Reference name="OpenSim.Framework"/> |
746 | <Reference name="OpenSim.Framework.Console"/> | 747 | <Reference name="OpenSim.Framework.Console"/> |
748 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
747 | <Reference name="OpenSim.Framework.Servers"/> | 749 | <Reference name="OpenSim.Framework.Servers"/> |
748 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 750 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
749 | <Reference name="Nini" path="../../../bin/"/> | 751 | <Reference name="Nini" path="../../../bin/"/> |