diff options
| author | Melanie | 2010-07-29 16:20:59 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-29 16:20:59 +0100 |
| commit | 7a9e246ccd0936932794782fdce2aa548145d859 (patch) | |
| tree | d462708caddc4929cc7018d2eb9fe564521f0b6b /.nant | |
| parent | Allow gods and estate managers/owners to be unaffected by parcel bans (diff) | |
| parent | Allow gods and estate managers/owners to be unaffected by parcel bans (diff) | |
| download | opensim-SC-7a9e246ccd0936932794782fdce2aa548145d859.zip opensim-SC-7a9e246ccd0936932794782fdce2aa548145d859.tar.gz opensim-SC-7a9e246ccd0936932794782fdce2aa548145d859.tar.bz2 opensim-SC-7a9e246ccd0936932794782fdce2aa548145d859.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '.nant')
| -rw-r--r-- | .nant/local.include | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.nant/local.include b/.nant/local.include index 0b6f9fe..0279f25 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | <delete dir="${distbindir}/.nant"/> | 20 | <delete dir="${distbindir}/.nant"/> |
| 21 | <delete> | 21 | <delete> |
| 22 | <fileset basedir="${distbindir}"> | 22 | <fileset basedir="${distbindir}"> |
| 23 | <include name="compile.bat"/> | ||
| 23 | <include name="BUILDING.txt"/> | 24 | <include name="BUILDING.txt"/> |
| 24 | <include name="Makefile"/> | 25 | <include name="Makefile"/> |
| 25 | <include name="nant-color"/> | 26 | <include name="nant-color"/> |
| @@ -29,7 +30,7 @@ | |||
| 29 | <include name="TESTING.txt"/> | 30 | <include name="TESTING.txt"/> |
| 30 | <include name="TestResult.xml"/> | 31 | <include name="TestResult.xml"/> |
| 31 | <include name="bin/OpenSim.Server.ini"/> | 32 | <include name="bin/OpenSim.Server.ini"/> |
| 32 | <include name="bin/Regions/*"/> | 33 | <include name="bin/Regions/Regions.ini"/> |
| 33 | <include name="bin/*.db"/> | 34 | <include name="bin/*.db"/> |
| 34 | <include name="**/.git/**"/> | 35 | <include name="**/.git/**"/> |
| 35 | <include name=".gitignore"/> | 36 | <include name=".gitignore"/> |