diff options
| author | Melanie | 2013-01-04 22:39:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-04 22:39:07 +0000 |
| commit | e62b14024f35121f1fd83bd6d3cd572ed9ba5897 (patch) | |
| tree | 987892e6227b79eb45d48c5df0f8b9acfdf30755 /.nant/local.include | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Set default particle burst count to 1 instead of 0 in any set particle system... (diff) | |
| download | opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.zip opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.gz opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.bz2 opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '.nant/local.include')
| -rw-r--r-- | .nant/local.include | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.nant/local.include b/.nant/local.include index 5185717..2339ce8 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
| @@ -43,6 +43,7 @@ | |||
| 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"/> |