diff options
| author | Mic Bowman | 2011-04-13 15:41:17 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-13 15:41:17 -0700 |
| commit | 590d20903c6dd596cb8ae3337065f955bd207b67 (patch) | |
| tree | f6b60205fd58b03f03c9110a68b2036a3ef075d2 /prebuild.xml | |
| parent | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff) | |
| parent | remove packet monitoring debugging code (diff) | |
| download | opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz | |
Merge branch 'testmerge' into queuetest
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.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 870ebf3..49063da 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -931,7 +931,6 @@ | |||
| 931 | <Reference name="OpenSim.Framework"/> | 931 | <Reference name="OpenSim.Framework"/> |
| 932 | <Reference name="OpenSim.Framework.Communications"/> | 932 | <Reference name="OpenSim.Framework.Communications"/> |
| 933 | <Reference name="OpenSim.Framework.Console"/> | 933 | <Reference name="OpenSim.Framework.Console"/> |
| 934 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
| 935 | <Reference name="OpenSim.Region.Framework"/> | 934 | <Reference name="OpenSim.Region.Framework"/> |
| 936 | <Reference name="OpenSim.Server.Base"/> | 935 | <Reference name="OpenSim.Server.Base"/> |
| 937 | <Reference name="OpenSim.Services.Base"/> | 936 | <Reference name="OpenSim.Services.Base"/> |
| @@ -2889,6 +2888,7 @@ | |||
| 2889 | <!-- SADLY the way this works means you need to keep adding these paths --> | 2888 | <!-- SADLY the way this works means you need to keep adding these paths --> |
| 2890 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> | 2889 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> |
| 2891 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 2890 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 2891 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | ||
| 2892 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 2892 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 2893 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> | 2893 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> |
| 2894 | <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/> | 2894 | <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/> |