diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /prebuild.xml | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 51dc70f..63590c8 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3011,6 +3011,8 @@ | |||
| 3011 | <Files> | 3011 | <Files> |
| 3012 | <!-- SADLY the way this works means you need to keep adding these paths --> | 3012 | <!-- SADLY the way this works means you need to keep adding these paths --> |
| 3013 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> | 3013 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> |
| 3014 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> | ||
| 3015 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> | ||
| 3014 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3016 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 3015 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | 3017 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> |
| 3016 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3018 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| @@ -3055,6 +3057,7 @@ | |||
| 3055 | <Reference name="OpenSim.Region.CoreModules"/> | 3057 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3056 | <Reference name="OpenSim.Region.OptionalModules"/> | 3058 | <Reference name="OpenSim.Region.OptionalModules"/> |
| 3057 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3059 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 3060 | <Reference name="OpenSim.Services.AvatarService"/> | ||
| 3058 | <Reference name="OpenSim.Services.Interfaces"/> | 3061 | <Reference name="OpenSim.Services.Interfaces"/> |
| 3059 | 3062 | ||
| 3060 | <!-- Unit tests --> | 3063 | <!-- Unit tests --> |
| @@ -3078,6 +3081,7 @@ | |||
| 3078 | <Files> | 3081 | <Files> |
| 3079 | <!-- SADLY the way this works means you need to keep adding these paths --> | 3082 | <!-- SADLY the way this works means you need to keep adding these paths --> |
| 3080 | <Match path="Avatar/XmlRpcGroups/Tests" pattern="*.cs" recurse="true"/> | 3083 | <Match path="Avatar/XmlRpcGroups/Tests" pattern="*.cs" recurse="true"/> |
| 3084 | <Match path="World/NPC/Tests" pattern="*.cs" recurse="true"/> | ||
| 3081 | </Files> | 3085 | </Files> |
| 3082 | </Project> | 3086 | </Project> |
| 3083 | 3087 | ||