diff options
| author | Melanie | 2013-02-05 21:30:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-05 21:30:12 +0000 |
| commit | d3892bbd0674e4f6912ce89e54712ea405dbbfb8 (patch) | |
| tree | 70ea1e0fea0e7eff5664bed1103e63d08c7b1c47 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.zip opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.gz opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.bz2 opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 77c91f7..0a4c914 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3148,6 +3148,7 @@ | |||
| 3148 | <Reference name="System.Drawing"/> | 3148 | <Reference name="System.Drawing"/> |
| 3149 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 3149 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 3150 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 3150 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 3151 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 3151 | <Reference name="OpenSim.Data"/> | 3152 | <Reference name="OpenSim.Data"/> |
| 3152 | <Reference name="OpenSim.Data.Null"/> | 3153 | <Reference name="OpenSim.Data.Null"/> |
| 3153 | <Reference name="OpenSim.Framework"/> | 3154 | <Reference name="OpenSim.Framework"/> |