diff options
| author | Melanie | 2013-05-30 21:48:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-30 21:48:09 +0100 |
| commit | 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch) | |
| tree | 6ea7f58cc6365595281f823f3994d2d22299ee40 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Try caching the user name for a new agent earlier on in the process of establ... (diff) | |
| download | opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.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 c611cb9..9a70b60 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3183,6 +3183,7 @@ | |||
| 3183 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3183 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 3184 | <Match path="Avatar/Inventory/Transfer/Tests" pattern="*.cs" recurse="true"/> | 3184 | <Match path="Avatar/Inventory/Transfer/Tests" pattern="*.cs" recurse="true"/> |
| 3185 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | 3185 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> |
| 3186 | <Match path="Framework/UserManagement/Tests" pattern="*.cs" recurse="true"/> | ||
| 3186 | <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/> | 3187 | <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/> |
| 3187 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 3188 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 3188 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> | 3189 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> |