diff options
| author | Melanie | 2013-04-30 23:45:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-30 23:45:38 +0100 |
| commit | b89d18e6f4a1099fe031ebf10776a752826604b9 (patch) | |
| tree | b964e6b167e156dc2adeddeb733d93eac342e9c0 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix error messages created while an avatar has no initial (diff) | |
| download | opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.zip opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.gz opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.bz2 opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.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 edf561e..ef07bdc 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3180,6 +3180,7 @@ | |||
| 3180 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> | 3180 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> |
| 3181 | <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/> | 3181 | <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/> |
| 3182 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3182 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 3183 | <Match path="Avatar/Inventory/Transfer/Tests" pattern="*.cs" recurse="true"/> | ||
| 3183 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | 3184 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> |
| 3184 | <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/> | 3185 | <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/> |
| 3185 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3186 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |