diff options
| author | Greg Munn <greg@sgmunn.com> | 2015-01-15 19:11:22 +0300 |
|---|---|---|
| committer | Greg Munn <greg@sgmunn.com> | 2015-01-15 19:11:22 +0300 |
| commit | 43f1f3b7beff621c07c0836abb2ec33db43a8fbb (patch) | |
| tree | d3866381f74f3ca54ce791119d53076d71d506ce /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui | |
| parent | ff02ea1fbf9b00c36144b009bca61ca45715f82e (diff) | |
| parent | af2ecb3305d213b204c229856b6000e45ffc2ffe (diff) | |
Merge branch 'master' into xamarin-publishing-workflow
Conflicts:
main/src/core/MonoDevelop.Ide/ExtensionModel/StockIcons.addin.xml
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs index 0bc3867bbe..7f08acc146 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/MonoDevelopStatusBar.cs @@ -92,7 +92,7 @@ namespace MonoDevelop.Ide if (FeedbackService.Enabled) { CustomFrame fr = new CustomFrame (0, 0, 1, 0); - var px = Xwt.Drawing.Image.FromResource ("feedback-light-16.png"); + var px = Xwt.Drawing.Image.FromResource ("feedback-16.png"); HBox b = new HBox (false, 3); b.PackStart (new Xwt.ImageView (px).ToGtkWidget ()); b.PackStart (new Gtk.Label ("Feedback")); |