diff options
| author | Melanie | 2012-09-27 17:29:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-27 17:29:44 +0100 |
| commit | 001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4 (patch) | |
| tree | 11170fddbd0f4c71c6f8288b5848442dfdc90d76 /prebuild.xml | |
| parent | Remove a core undo call that we don't need. (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.zip opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.gz opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.bz2 opensim-SC_OLD-001ec0e2e6f8c426af8f4a1c1eb9be4db066aea4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 4e12fe9..d149010 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -162,6 +162,7 @@ | |||
| 162 | <Reference name="XMLRPC" path="../../../../bin/"/> | 162 | <Reference name="XMLRPC" path="../../../../bin/"/> |
| 163 | <Reference name="log4net" path="../../../../bin/"/> | 163 | <Reference name="log4net" path="../../../../bin/"/> |
| 164 | <Reference name="HttpServer_OpenSim" path="../../../../bin/"/> | 164 | <Reference name="HttpServer_OpenSim" path="../../../../bin/"/> |
| 165 | <Reference name="SmartThreadPool"/> | ||
| 165 | 166 | ||
| 166 | <Files> | 167 | <Files> |
| 167 | <Match pattern="*.cs" recurse="true"> | 168 | <Match pattern="*.cs" recurse="true"> |
| @@ -1703,7 +1704,7 @@ | |||
| 1703 | <Reference name="OpenSim.Capabilities"/> | 1704 | <Reference name="OpenSim.Capabilities"/> |
| 1704 | <Reference name="OpenSim.Capabilities.Handlers"/> | 1705 | <Reference name="OpenSim.Capabilities.Handlers"/> |
| 1705 | <Reference name="OpenSim.Framework"/> | 1706 | <Reference name="OpenSim.Framework"/> |
| 1706 | <Reference name="OpenSim.Framework.Monitoring"/> | 1707 | <Reference name="OpenSim.Framework.Monitoring"/> |
| 1707 | <Reference name="OpenSim.Framework.Servers"/> | 1708 | <Reference name="OpenSim.Framework.Servers"/> |
| 1708 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1709 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 1709 | <Reference name="OpenSim.Framework.Console"/> | 1710 | <Reference name="OpenSim.Framework.Console"/> |
| @@ -1713,6 +1714,7 @@ | |||
| 1713 | <Reference name="Nini" path="../../../../../bin/"/> | 1714 | <Reference name="Nini" path="../../../../../bin/"/> |
| 1714 | <Reference name="log4net" path="../../../../../bin/"/> | 1715 | <Reference name="log4net" path="../../../../../bin/"/> |
| 1715 | <Reference name="Nini" path="../../../../../bin/"/> | 1716 | <Reference name="Nini" path="../../../../../bin/"/> |
| 1717 | <Reference name="zlib.net" path="../../../../../bin/"/> | ||
| 1716 | 1718 | ||
| 1717 | <Files> | 1719 | <Files> |
| 1718 | <Match pattern="*.cs" recurse="true"> | 1720 | <Match pattern="*.cs" recurse="true"> |