/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive.glade

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-02-04 12:05:45 UTC
  • mto: (157.1.3 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 160.
  • Revision ID: szilveszter.farkas@gmail.com-20070204120545-o7rxnkmhjctvkhnb
Added Conflicts entry to the Branch menu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
341
341
                      <signal name="activate" handler="on_menuitem_branch_missing_revisions_activate" last_modification_time="Sat, 02 Sep 2006 14:01:29 GMT"/>
342
342
                    </widget>
343
343
                  </child>
 
344
                  
 
345
                  <child>
 
346
                    <widget class="GtkMenuItem" id="menuitem_branch_conflicts">
 
347
                      <property name="visible">True</property>
 
348
                      <property name="label" translatable="yes">Con_flicts...</property>
 
349
                      <property name="use_underline">True</property>
 
350
                      <signal name="activate" handler="on_menuitem_branch_conflicts_activate" last_modification_time="Sun, 04 Feb 2007 12:54:00 GMT"/>
 
351
                    </widget>
 
352
                  </child>
344
353
                </widget>
345
354
              </child>
346
355
            </widget>