diff options
| author | Melanie | 2013-03-08 01:07:05 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-08 01:07:05 +0000 |
| commit | 70f0587558a30d61b311af8de6aa8baeb7a498f8 (patch) | |
| tree | 9a9b09125f0b6cdd54ac1874fda2b39851d465a0 /prebuild.xml | |
| parent | * Separate two if trees that got merged into one if tree with borked logic. (diff) | |
| parent | * Just another one of those new packet blocks causing a null ref. Defaultin... (diff) | |
| download | opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.zip opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.gz opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.bz2 opensim-SC-70f0587558a30d61b311af8de6aa8baeb7a498f8.tar.xz | |
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"/> |