From e68d67031ef224da375c0473d2f44902623acb0f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 24 Mar 2006 16:07:54 +0100
Subject: * merge with the stuff from the update-manager--mvo branch

---
 DistUpgrade/DistUpgrade.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'DistUpgrade/DistUpgrade.glade')

diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade
index e50476e2..08b96a11 100644
--- a/DistUpgrade/DistUpgrade.glade
+++ b/DistUpgrade/DistUpgrade.glade
@@ -520,7 +520,7 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="button_cancel">
+	    <widget class="GtkButton" id="button_cancel_changes">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -533,7 +533,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="button_start">
+	    <widget class="GtkButton" id="button_confirm_changes">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-- 
cgit v1.2.3