diff options
| author | Justin Clark-Casey (justincc) | 2013-07-06 00:55:35 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-06 00:55:35 +0100 |
| commit | 2f6ee8aee2899ae54e3e7ab19509698b84da612f (patch) | |
| tree | b111b91c53438987bdc654f9598194c5a162e72e | |
| parent | Fix mono warning in LLImageManagerTests (diff) | |
| parent | Fix windows build break fromrecent dd1f95 for real this time - put new dll re... (diff) | |
| download | opensim-SC_OLD-2f6ee8aee2899ae54e3e7ab19509698b84da612f.zip opensim-SC_OLD-2f6ee8aee2899ae54e3e7ab19509698b84da612f.tar.gz opensim-SC_OLD-2f6ee8aee2899ae54e3e7ab19509698b84da612f.tar.bz2 opensim-SC_OLD-2f6ee8aee2899ae54e3e7ab19509698b84da612f.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 74cfcb0..d9e32ea 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2965,7 +2965,6 @@ | |||
| 2965 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 2965 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 2966 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 2966 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 2967 | <Reference name="XMLRPC" path="../../../bin/"/> | 2967 | <Reference name="XMLRPC" path="../../../bin/"/> |
| 2968 | <Reference name="OpenSim.Capabilities"/> | ||
| 2969 | <Reference name="OpenSim.Framework.Console"/> | 2968 | <Reference name="OpenSim.Framework.Console"/> |
| 2970 | <Reference name="OpenSim.Framework"/> | 2969 | <Reference name="OpenSim.Framework"/> |
| 2971 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2970 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| @@ -3197,6 +3196,7 @@ | |||
| 3197 | <Reference name="System.Runtime.Remoting"/> | 3196 | <Reference name="System.Runtime.Remoting"/> |
| 3198 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 3197 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 3199 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 3198 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 3199 | <Reference name="OpenSim.Capabilities"/> | ||
| 3200 | <Reference name="OpenSim.Data"/> | 3200 | <Reference name="OpenSim.Data"/> |
| 3201 | <Reference name="OpenSim.Framework"/> | 3201 | <Reference name="OpenSim.Framework"/> |
| 3202 | <Reference name="OpenSim.Framework.Communications"/> | 3202 | <Reference name="OpenSim.Framework.Communications"/> |