diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index f64a1a8..d73f154 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2959,6 +2959,7 @@ | |||
| 2959 | <Reference name="Nini" path="../../../bin/"/> | 2959 | <Reference name="Nini" path="../../../bin/"/> |
| 2960 | <Reference name="nunit.framework" path="../../../bin/"/> | 2960 | <Reference name="nunit.framework" path="../../../bin/"/> |
| 2961 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 2961 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 2962 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 2962 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 2963 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 2963 | <Reference name="OpenSim.Data"/> | 2964 | <Reference name="OpenSim.Data"/> |
| 2964 | <Reference name="OpenSim.Data.Null"/> | 2965 | <Reference name="OpenSim.Data.Null"/> |