diff options
| author | Melanie | 2012-08-03 16:46:11 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:46:11 +0100 |
| commit | 0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch) | |
| tree | 3f19d7653c984120f16b3a2ea74ccf6b34928a2e /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff) | |
| download | opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2 opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 1b599a9..621e0b4 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3077,13 +3077,13 @@ | |||
| 3077 | --> | 3077 | --> |
| 3078 | <Files> | 3078 | <Files> |
| 3079 | <!-- SADLY the way this works means you need to keep adding these paths --> | 3079 | <!-- SADLY the way this works means you need to keep adding these paths --> |
| 3080 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> | ||
| 3081 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> | 3080 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> |
| 3082 | <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/> | 3081 | <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/> |
| 3083 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> | 3082 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> |
| 3084 | <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/> | 3083 | <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/> |
| 3085 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3084 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 3086 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | 3085 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> |
| 3086 | <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/> | ||
| 3087 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3087 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 3088 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> | 3088 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> |
| 3089 | <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/> | 3089 | <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/> |