diff options
| author | Melanie | 2013-06-06 03:20:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-06 03:20:15 +0100 |
| commit | fe4a67efb6f54cad3f00884712abe03704216421 (patch) | |
| tree | 04de93aaa8e9430c7c33e15912b3683b0297a10a /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Update HTTP server (diff) | |
| download | opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.zip opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.gz opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.bz2 opensim-SC_OLD-fe4a67efb6f54cad3f00884712abe03704216421.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2db4e2b..2eb0a92 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1812,6 +1812,8 @@ | |||
| 1812 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1812 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 1813 | <Reference name="OpenSim.Region.CoreModules"/> | 1813 | <Reference name="OpenSim.Region.CoreModules"/> |
| 1814 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 1814 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
| 1815 | <Reference name="OpenSim.Region.Framework.Interfaces"/> | ||
| 1816 | <Reference name="OpenSim.Region.Framework.Scenes"/> | ||
| 1815 | <Reference name="OpenSim.Region.Framework"/> | 1817 | <Reference name="OpenSim.Region.Framework"/> |
| 1816 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1818 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 1817 | <Reference name="OpenSim.Server.Base"/> | 1819 | <Reference name="OpenSim.Server.Base"/> |
| @@ -3263,6 +3265,7 @@ | |||
| 3263 | <Reference name="OpenSim.Framework.Servers"/> | 3265 | <Reference name="OpenSim.Framework.Servers"/> |
| 3264 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3266 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3265 | <Reference name="OpenSim.Region.Framework"/> | 3267 | <Reference name="OpenSim.Region.Framework"/> |
| 3268 | <Reference name="OpenSim.Region.Framework.Interfaces"/> | ||
| 3266 | <Reference name="OpenSim.Region.CoreModules"/> | 3269 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3267 | <Reference name="OpenSim.Region.OptionalModules"/> | 3270 | <Reference name="OpenSim.Region.OptionalModules"/> |
| 3268 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3271 | <Reference name="OpenSim.Region.Physics.Manager"/> |