diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-01-11 13:47:54 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-01-11 13:47:54 +0400 |
| commit | 989a90bf0a28718dc3a997282929e52b4c376374 (patch) | |
| tree | 5ec66c28e6f983692ef5fe3af71c1e6193a17e8e /extras/MonoDevelop.MonoMac | |
| parent | 179764995179f0b7508a9a1e5f47d044517f6705 (diff) | |
| parent | d565dea45df415c33645207f884084f72dcbb561 (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilAttribute.cs
Diffstat (limited to 'extras/MonoDevelop.MonoMac')
| -rw-r--r-- | extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs index f027cc89eb..988ced1a81 100644 --- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs +++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs @@ -120,7 +120,7 @@ namespace MonoDevelop.MonoMac.Gui try { //user will have agreed to overwrite when they picked the target if (Directory.Exists (target)) - Directory.Delete (target); + Directory.Delete (target, true); else if (File.Exists (target)) File.Delete (target); |