Lernid

Merge lp:~jonobacon/lernid/sample-merge into lp:lernid

  1. sample-merge
  2. Merge into trunk
Proposed by Jono Bacon
Status: Merged
Approved by: Jono Bacon
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~jonobacon/lernid/sample-merge
Merge into: lp:lernid
Diff against target: 12 lines (+1/-1)
1 file modified
data/ui/ConnectDialog.ui (+1/-1)
To merge this branch: bzr merge lp:~jonobacon/lernid/sample-merge
Reviewer Review Type Date Requested Status
Jono Bacon Approve
Review via email: mp+15257@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jono Bacon (jonobacon) wrote :

Sample of proposing a merge.

Revision history for this message
Jono Bacon (jonobacon) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/ui/ConnectDialog.ui'
--- data/ui/ConnectDialog.ui 2009-11-25 04:18:10 +0000
+++ data/ui/ConnectDialog.ui 2009-11-25 23:25:18 +0000
@@ -102,7 +102,7 @@
102 </child>102 </child>
103 <child>103 <child>
104 <object class="GtkButton" id="button1">104 <object class="GtkButton" id="button1">
105 <property name="label">gtk-ok</property>105 <property name="label">gtk-connect</property>
106 <property name="visible">True</property>106 <property name="visible">True</property>
107 <property name="can_focus">True</property>107 <property name="can_focus">True</property>
108 <property name="receives_default">True</property>108 <property name="receives_default">True</property>

Subscribers

People subscribed via source and target branches