diff options
| author | Melanie | 2011-11-14 20:03:47 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-14 20:03:47 +0000 |
| commit | afca742392e30748de13a125f932046949af0bcb (patch) | |
| tree | 34e9dd92533abe446e356d9fb1ad8625cb28c9bc /prebuild.xml | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | minor: remove some mono compiler warnings (diff) | |
| download | opensim-SC-afca742392e30748de13a125f932046949af0bcb.zip opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.gz opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.bz2 opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index ecc60fb..d1a1cf8 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2947,6 +2947,7 @@ | |||
| 2947 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> | 2947 | <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> |
| 2948 | <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/> | 2948 | <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/> |
| 2949 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> | 2949 | <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> |
| 2950 | <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/> | ||
| 2950 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 2951 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 2951 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | 2952 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> |
| 2952 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 2953 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |