diff options
author | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
commit | a160b44e0766329a6c336adcb804cede39e00fc7 (patch) | |
tree | edf6d5070a0bb9dcba424cf883fe20a7c96af751 /.nant | |
parent | If a transfer request is received for a task inventory item asset, then route... (diff) | |
parent | minor: remove some commented out code and return ScenePresence.UpdatePriority... (diff) | |
download | opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.zip opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2 opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz |
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to '.nant')
-rw-r--r-- | .nant/local.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.nant/local.include b/.nant/local.include index 94398a2..3db063b 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -7,8 +7,8 @@ | |||
7 | <property name="distbindir" value="distbin" /> | 7 | <property name="distbindir" value="distbin" /> |
8 | <target name="distbin"> | 8 | <target name="distbin"> |
9 | <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/> | 9 | <copy file="bin/OpenSim.ini.example" tofile="bin/OpenSim.ini"/> |
10 | <copy file="bin/config-include/StandaloneCommon.ini.example" tofile="bin/config-include/StandaloneCommon.ini"/> | ||
10 | <delete dir="${distbindir}"/> | 11 | <delete dir="${distbindir}"/> |
11 | <!-- <copy file="*" todir="${distbindir}"/> --> | ||
12 | <copy todir="${distbindir}"> | 12 | <copy todir="${distbindir}"> |
13 | <fileset> | 13 | <fileset> |
14 | <include name="**"/> | 14 | <include name="**"/> |