diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /Prebuild/src | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'Prebuild/src')
| -rw-r--r-- | Prebuild/src/Core/Targets/.NAntTarget.cs.swp | bin | 49152 -> 0 bytes | |||
| -rw-r--r-- | Prebuild/src/Core/Targets/NAntTarget.cs | 5 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Prebuild/src/Core/Targets/.NAntTarget.cs.swp b/Prebuild/src/Core/Targets/.NAntTarget.cs.swp deleted file mode 100644 index afec61c..0000000 --- a/Prebuild/src/Core/Targets/.NAntTarget.cs.swp +++ /dev/null | |||
| Binary files differ | |||
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index d4a33f8..1966f66 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs | |||
| @@ -644,9 +644,12 @@ namespace Prebuild.Core.Targets | |||
| 644 | ss.WriteLine(" <delete failonerror=\"false\">"); | 644 | ss.WriteLine(" <delete failonerror=\"false\">"); |
| 645 | ss.WriteLine(" <fileset basedir=\"${bin.dir}\">"); | 645 | ss.WriteLine(" <fileset basedir=\"${bin.dir}\">"); |
| 646 | ss.WriteLine(" <include name=\"OpenSim*.dll\"/>"); | 646 | ss.WriteLine(" <include name=\"OpenSim*.dll\"/>"); |
| 647 | ss.WriteLine(" <include name=\"OpenSim*.dll.mdb\"/>"); | ||
| 647 | ss.WriteLine(" <include name=\"OpenSim*.exe\"/>"); | 648 | ss.WriteLine(" <include name=\"OpenSim*.exe\"/>"); |
| 649 | ss.WriteLine(" <include name=\"OpenSim*.exe.mdb\"/>"); | ||
| 648 | ss.WriteLine(" <include name=\"ScriptEngines/*\"/>"); | 650 | ss.WriteLine(" <include name=\"ScriptEngines/*\"/>"); |
| 649 | ss.WriteLine(" <include name=\"Physics/*\"/>"); | 651 | ss.WriteLine(" <include name=\"Physics/*.dll\"/>"); |
| 652 | ss.WriteLine(" <include name=\"Physics/*.dll.mdb\"/>"); | ||
| 650 | ss.WriteLine(" <exclude name=\"OpenSim.32BitLaunch.exe\"/>"); | 653 | ss.WriteLine(" <exclude name=\"OpenSim.32BitLaunch.exe\"/>"); |
| 651 | ss.WriteLine(" <exclude name=\"ScriptEngines/Default.lsl\"/>"); | 654 | ss.WriteLine(" <exclude name=\"ScriptEngines/Default.lsl\"/>"); |
| 652 | ss.WriteLine(" </fileset>"); | 655 | ss.WriteLine(" </fileset>"); |