diff options
| author | Melanie | 2011-11-17 19:04:27 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-17 19:04:27 +0000 |
| commit | 31736b1aac0387e51fe37ea9bab2e2e8c86988b6 (patch) | |
| tree | 14fbdc5f9b677185db1fe8080dafe28796c09336 /prebuild.xml | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... (diff) | |
| download | opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.zip opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.gz opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.bz2 opensim-SC_OLD-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index d1a1cf8..56e7904 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1724,7 +1724,6 @@ | |||
| 1724 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 1724 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 1725 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 1725 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 1726 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1726 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 1727 | <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/> | ||
| 1728 | <Reference name="OpenSim.Capabilities"/> | 1727 | <Reference name="OpenSim.Capabilities"/> |
| 1729 | <Reference name="OpenSim.Framework"/> | 1728 | <Reference name="OpenSim.Framework"/> |
| 1730 | <Reference name="OpenSim.Framework.Communications"/> | 1729 | <Reference name="OpenSim.Framework.Communications"/> |