diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2016-10-04 19:12:10 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2016-10-04 19:12:10 +0300 |
| commit | 8e8ad02389171bd7ba01286109bc45ca4a3fe116 (patch) | |
| tree | 38e05a4ccfbbbd14acb890eeed23793aeefc834b /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels | |
| parent | 99563ca4eaa520d851f2babdee45ee34be76568a (diff) | |
| parent | 68479785e8276ddf533e9d088a40a093edba7fb1 (diff) | |
Merge branch 'master' into monodevelop-pr-1622
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels')
3 files changed, 3 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs index 4bc2641e72..69275d1ced 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/CodeFormattingPanel.cs @@ -109,7 +109,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels MimeTypePanelData AddPanel (string mt) { - var chain = new List<string> (DesktopService.GetMimeTypeInheritanceChain (mt).Where (x => mimeTypesWithPolicies.Contains (x))); + var chain = new List<string> (DesktopService.GetMimeTypeInheritanceChain (mt).Where (mimeTypesWithPolicies.Contains)); if (chain.Count == 0) return null; MimeTypePanelData data = new MimeTypePanelData (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs index f3ad88e58e..0dd7609cc2 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeOptionsPanel.cs @@ -487,4 +487,4 @@ namespace MonoDevelop.Ide.Projects.OptionPanels return minimum; } } -}
\ No newline at end of file +} diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeSelectorDialog.cs index 732a96a559..bf1d163904 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeSelectorDialog.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/PortableRuntimeSelectorDialog.cs @@ -566,7 +566,7 @@ namespace MonoDevelop.Ide.Projects.OptionPanels } AddInfo (GettextCatalog.GetString ("The following frameworks have been implicitly selected:")); - AddInfo (" " + string.Join (", ", common.Select (c => GetDisplayName (c)))); + AddInfo (" " + string.Join (", ", common.Select (GetDisplayName))); // Implicitly select them. var implicitlySelected = new List<SupportedFramework> (); |