diff options
author | Vsevolod Kukol <sevoku@xamarin.com> | 2015-12-10 18:51:39 +0300 |
---|---|---|
committer | Vsevolod Kukol <sevoku@xamarin.com> | 2015-12-10 18:51:39 +0300 |
commit | 374cdf4d5adc6d69df45aae2ffa6a45db44bc5b8 (patch) | |
tree | 0e699cbebb45d73a97c4b0008ec80572ffda2de5 /main/src/addins/Deployment/MonoDevelop.Deployment | |
parent | 98254ef424edfb228aed22986a84d4aa37b143e3 (diff) | |
parent | 74dc51da0b4fa2271a82d9ee1073b4723a7c5e50 (diff) |
Merge remote-tracking branch 'origin/master' into roslyn-dark-skin
Diffstat (limited to 'main/src/addins/Deployment/MonoDevelop.Deployment')
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs index e956190e7a..fd428d98ef 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/SourcesZipEditorWidget.cs @@ -4,7 +4,7 @@ using System.Collections; using System.IO; using MonoDevelop.Projects; using MonoDevelop.Deployment.Targets; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; using System.Linq; namespace MonoDevelop.Deployment.Gui diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs index 26e9cd891c..5cf009cc19 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Targets/SourcesZipPackageBuilder.cs @@ -7,7 +7,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.ProgressMonitoring; using MonoDevelop.Projects; using MonoDevelop.Core.Serialization; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Deployment.Targets { |