diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /.nant | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
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 5185717..c207944 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -43,10 +43,11 @@ | |||
| 43 | <delete dir="${distbindir}/Prebuild"/> | 43 | <delete dir="${distbindir}/Prebuild"/> |
| 44 | <delete dir="${distbindir}/%temp%"/> | 44 | <delete dir="${distbindir}/%temp%"/> |
| 45 | <delete dir="${distbindir}/.nant"/> | 45 | <delete dir="${distbindir}/.nant"/> |
| 46 | <delete dir="${distbindir}/ThirdParty"/> | ||
| 46 | <delete> | 47 | <delete> |
| 47 | <fileset basedir="${distbindir}"> | 48 | <fileset basedir="${distbindir}"> |
| 48 | <include name="compile.bat"/> | 49 | <include name="compile.bat"/> |
| 49 | <include name="BUILDING.txt"/> | 50 | <include name="BUILDING.md"/> |
| 50 | <include name="Makefile"/> | 51 | <include name="Makefile"/> |
| 51 | <include name="nant-color"/> | 52 | <include name="nant-color"/> |
| 52 | <include name="OpenSim.*"/> | 53 | <include name="OpenSim.*"/> |