diff options
| author | Melanie | 2012-04-27 22:28:09 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-27 22:28:09 +0100 |
| commit | dcbcbd697f70d361b63d502512d2731e0ee6e046 (patch) | |
| tree | 8168b0dc214e9cb710b0972d5f03a7da3164189b /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix prebuild.xml (diff) | |
| download | opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.zip opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.gz opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.bz2 opensim-SC_OLD-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.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 b908649..c840f03 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1567,6 +1567,7 @@ | |||
| 1567 | <Reference name="OpenSim.Services.Connectors"/> | 1567 | <Reference name="OpenSim.Services.Connectors"/> |
| 1568 | <Reference name="OpenSim.Services.Base"/> | 1568 | <Reference name="OpenSim.Services.Base"/> |
| 1569 | <Reference name="OpenSim.Services.Interfaces"/> | 1569 | <Reference name="OpenSim.Services.Interfaces"/> |
| 1570 | <Reference name="Ionic.Zip" path="../../../bin/"/> | ||
| 1570 | 1571 | ||
| 1571 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> | 1572 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> |
| 1572 | 1573 | ||