diff options
author | Justin Clark-Casey (justincc) | 2012-04-27 23:39:13 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-27 23:39:13 +0100 |
commit | da29cbccfa0aab635d5e5c44c52a0d5f8d4844a0 (patch) | |
tree | ed55c9555cfa0adfb5d22dd83ffea87ae4e059d0 | |
parent | Add flags information (phantom, physics, etc.) to "show object" and "show par... (diff) | |
parent | Fix prebuild.xml (diff) | |
download | opensim-SC_OLD-da29cbccfa0aab635d5e5c44c52a0d5f8d4844a0.zip opensim-SC_OLD-da29cbccfa0aab635d5e5c44c52a0d5f8d4844a0.tar.gz opensim-SC_OLD-da29cbccfa0aab635d5e5c44c52a0d5f8d4844a0.tar.bz2 opensim-SC_OLD-da29cbccfa0aab635d5e5c44c52a0d5f8d4844a0.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r-- | prebuild.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 0c90ac0..5003ae7 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1472,7 +1472,7 @@ | |||
1472 | <Reference name="OpenSim.Services.Connectors"/> | 1472 | <Reference name="OpenSim.Services.Connectors"/> |
1473 | <Reference name="OpenSim.Services.Base"/> | 1473 | <Reference name="OpenSim.Services.Base"/> |
1474 | <Reference name="OpenSim.Services.Interfaces"/> | 1474 | <Reference name="OpenSim.Services.Interfaces"/> |
1475 | <Reference name="Ionic.Zip"/> | 1475 | <Reference name="Ionic.Zip" path="../../../bin/"/> |
1476 | 1476 | ||
1477 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> | 1477 | <Reference name="GlynnTucker.Cache" path="../../../bin/"/> |
1478 | 1478 | ||