diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2012-02-20 16:58:33 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2012-02-20 16:58:33 +0400 |
| commit | 06fda9a5a59a241aec24b6703aadd7bae49cd939 (patch) | |
| tree | af24300e5d97d01770c88b130ac77124ce1563ad /main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui | |
| parent | 4fa94e7189cd0540e295c9992e9fcd7e8457a319 (diff) | |
| parent | 1f68e48d789fd3b86d8879f91b599a8aa144dcfd (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/GtkAlertDialog.cs
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui')
2 files changed, 1 insertions, 5 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs index 0db51e582f..3b37dd72b3 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/MonoDevelop.VersionControl.Dialogs.CommitDialog.cs @@ -82,8 +82,6 @@ namespace MonoDevelop.VersionControl.Dialogs global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.mainBox [this.scrolledwindow2])); w7.PackType = ((global::Gtk.PackType)(1)); w7.Position = 3; - w7.Expand = false; - w7.Fill = false; // Container child mainBox.Gtk.Box+BoxChild this.label2 = new global::Gtk.Label (); this.label2.Name = "label2"; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic index 1a570cd459..6d4283d615 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/gtk-gui/gui.stetic @@ -1131,9 +1131,7 @@ <packing> <property name="PackType">End</property> <property name="Position">3</property> - <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> + <property name="AutoSize">True</property> </packing> </child> <child> |