diff options
| author | Melanie | 2012-12-07 03:49:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-07 03:49:04 +0000 |
| commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
| tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml index 7f47d5b..8bf5374 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2168,7 +2168,7 @@ | |||
| 2168 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 2168 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 2169 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 2169 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 2170 | <Reference name="Nini" path="../../../bin/"/> | 2170 | <Reference name="Nini" path="../../../bin/"/> |
| 2171 | <Reference name="Mono.Addins"/> | 2171 | <Reference name="Mono.Addins" path="../../../bin/"/> |
| 2172 | <Reference name="log4net" path="../../../bin/"/> | 2172 | <Reference name="log4net" path="../../../bin/"/> |
| 2173 | <Files> | 2173 | <Files> |
| 2174 | <Match pattern="*.cs" recurse="true"/> | 2174 | <Match pattern="*.cs" recurse="true"/> |
| @@ -2577,7 +2577,7 @@ | |||
| 2577 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2577 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 2578 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2578 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 2579 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> | 2579 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
| 2580 | <Reference name="Mono.Addins"/> | 2580 | <Reference name="Mono.Addins" path="../../../bin/"/> |
| 2581 | 2581 | ||
| 2582 | <!-- For scripting in funny languages by default --> | 2582 | <!-- For scripting in funny languages by default --> |
| 2583 | <Reference name="XMLRPC" path="../../../bin/"/> | 2583 | <Reference name="XMLRPC" path="../../../bin/"/> |