diff options
| author | Melanie | 2012-11-15 03:46:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-15 03:46:10 +0000 |
| commit | 5895c4cc6f698bcb415b08a96322f06fb44413ca (patch) | |
| tree | 5b223f297b27ac3966c65526f422fc82095b9b86 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improve inventory folder version updating for mssql database plugin. (diff) | |
| download | opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.zip opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.gz opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.bz2 opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml index 08e7070..8bf8cf5 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2257,10 +2257,11 @@ | |||
| 2257 | 2257 | ||
| 2258 | <ReferencePath>../../../bin/</ReferencePath> | 2258 | <ReferencePath>../../../bin/</ReferencePath> |
| 2259 | <Reference name="System"/> | 2259 | <Reference name="System"/> |
| 2260 | <Reference name="System.Xml"/> | 2260 | <Reference name="System.Core"/> |
| 2261 | <Reference name="System.Data"/> | 2261 | <Reference name="System.Data"/> |
| 2262 | <Reference name="OpenSim.Data"/> | ||
| 2263 | <Reference name="System.Drawing"/> | 2262 | <Reference name="System.Drawing"/> |
| 2263 | <Reference name="System.Xml"/> | ||
| 2264 | <Reference name="OpenSim.Data"/> | ||
| 2264 | <Reference name="OpenSim.Framework"/> | 2265 | <Reference name="OpenSim.Framework"/> |
| 2265 | <Reference name="OpenSim.Framework.Console"/> | 2266 | <Reference name="OpenSim.Framework.Console"/> |
| 2266 | <Reference name="OpenSim.Region.Framework"/> | 2267 | <Reference name="OpenSim.Region.Framework"/> |