diff options
author | Melanie | 2010-05-03 01:40:24 +0100 |
---|---|---|
committer | Melanie | 2010-05-03 01:40:24 +0100 |
commit | 9f8acbfe3e6206893822bc3b7edbadbd7cae7a16 (patch) | |
tree | dd9485b0c6b4cbfa0399501f43d7d70d4ed438aa /.nant | |
parent | Make the IUserAccountData properly unpack the god mode data, so grid gods (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.zip opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.gz opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.bz2 opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.xz |
Merge branch 'master' into careminster-presence-refactor
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 2591aba..b78b3ef 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="**"/> |