diff options
| author | Melanie | 2013-06-23 01:59:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:59:57 +0100 |
| commit | f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch) | |
| tree | ffda32c340bd7f6d69652e9d9a959c7396f42a2f /prebuild.xml | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2eb0a92..5076cf4 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -157,6 +157,7 @@ | |||
| 157 | <Reference name="System"/> | 157 | <Reference name="System"/> |
| 158 | <Reference name="System.Core"/> | 158 | <Reference name="System.Core"/> |
| 159 | <Reference name="log4net" path="../../../bin/"/> | 159 | <Reference name="log4net" path="../../../bin/"/> |
| 160 | <Reference name="Nini" path="../../../bin/"/> | ||
| 160 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 161 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 161 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 162 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 162 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 163 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| @@ -863,6 +864,7 @@ | |||
| 863 | <Reference name="Mono.Addins.Setup" path="../../../bin/"/> | 864 | <Reference name="Mono.Addins.Setup" path="../../../bin/"/> |
| 864 | <Reference name="OpenSim.Framework"/> | 865 | <Reference name="OpenSim.Framework"/> |
| 865 | <Reference name="OpenSim.Framework.Console"/> | 866 | <Reference name="OpenSim.Framework.Console"/> |
| 867 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
| 866 | <Reference name="OpenSim.Framework.Servers"/> | 868 | <Reference name="OpenSim.Framework.Servers"/> |
| 867 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 869 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 868 | <Reference name="Nini" path="../../../bin/"/> | 870 | <Reference name="Nini" path="../../../bin/"/> |