diff options
author | Melanie | 2013-01-31 02:53:11 +0000 |
---|---|---|
committer | Melanie | 2013-01-31 02:53:11 +0000 |
commit | 9a4de546fe92105c570d6861377ec47d32b4186e (patch) | |
tree | edfb86074fc7c78126203a2c05a38e260c0d4076 /prebuild.xml | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Add JsonTestStore to determine if a JsonStore is associated with (diff) | |
download | opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.zip opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.gz opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.bz2 opensim-SC_OLD-9a4de546fe92105c570d6861377ec47d32b4186e.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 4caa1a6..77c91f7 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -3484,6 +3484,40 @@ | |||
3484 | </Files> | 3484 | </Files> |
3485 | </Project> | 3485 | </Project> |
3486 | 3486 | ||
3487 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin.Tests" path="OpenSim/Region/Physics/BulletSPlugin/Tests" type="Library"> | ||
3488 | <Configuration name="Debug"> | ||
3489 | <Options> | ||
3490 | <OutputPath>../../../../../bin/</OutputPath> | ||
3491 | </Options> | ||
3492 | </Configuration> | ||
3493 | <Configuration name="Release"> | ||
3494 | <Options> | ||
3495 | <OutputPath>../../../../../bin/</OutputPath> | ||
3496 | </Options> | ||
3497 | </Configuration> | ||
3498 | |||
3499 | <ReferencePath>../../../../../bin/</ReferencePath> | ||
3500 | <Reference name="System"/> | ||
3501 | <Reference name="System.Core"/> | ||
3502 | <Reference name="System.Data"/> | ||
3503 | <Reference name="Nini" path="../../../../../bin/"/> | ||
3504 | <Reference name="log4net" path="../../../../../bin/"/> | ||
3505 | <Reference name="nunit.framework" path="../../../../../bin/"/> | ||
3506 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> | ||
3507 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> | ||
3508 | <Reference name="OpenSim.Framework"/> | ||
3509 | <Reference name="OpenSim.Tests.Common"/> | ||
3510 | <Reference name="OpenSim.Region.CoreModules"/> | ||
3511 | <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../../bin/Physics/"/> | ||
3512 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
3513 | <Reference name="OpenSim.Region.Physics.BulletSPlugin" path="../../../../../bin/Physics/"/> | ||
3514 | |||
3515 | <Files> | ||
3516 | <Match pattern="*.cs" recurse="false"/> | ||
3517 | </Files> | ||
3518 | </Project> | ||
3519 | |||
3520 | |||
3487 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library"> | 3521 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers" type="Library"> |
3488 | <Configuration name="Debug"> | 3522 | <Configuration name="Debug"> |
3489 | <Options> | 3523 | <Options> |