diff options
| author | Melanie | 2013-08-01 01:23:24 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-01 01:23:24 +0100 |
| commit | 21f5e670303ee978c747567e674e5ebe256ad2c7 (patch) | |
| tree | 19c3740cbb8bf78d038e64b2fb66ea837cc8f724 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Include missing reference that probably stops windows build from commit 12995... (diff) | |
| download | opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.zip opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.gz opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.bz2 opensim-SC_OLD-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
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 d536539..87c07a7 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -988,8 +988,10 @@ | |||
| 988 | <Reference name="Mono.Addins" path="../../../bin/"/> | 988 | <Reference name="Mono.Addins" path="../../../bin/"/> |
| 989 | <Reference name="OpenSim.Data"/> | 989 | <Reference name="OpenSim.Data"/> |
| 990 | <Reference name="OpenSim.Framework"/> | 990 | <Reference name="OpenSim.Framework"/> |
| 991 | <Reference name="OpenSim.Capabilities"/> | ||
| 991 | <Reference name="OpenSim.Framework.Communications"/> | 992 | <Reference name="OpenSim.Framework.Communications"/> |
| 992 | <Reference name="OpenSim.Framework.Console"/> | 993 | <Reference name="OpenSim.Framework.Console"/> |
| 994 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
| 993 | <Reference name="OpenSim.Region.Framework"/> | 995 | <Reference name="OpenSim.Region.Framework"/> |
| 994 | <Reference name="OpenSim.Server.Base"/> | 996 | <Reference name="OpenSim.Server.Base"/> |
| 995 | <Reference name="OpenSim.Services.Base"/> | 997 | <Reference name="OpenSim.Services.Base"/> |