← Back to branch summary

~ubuntu-branches/ubuntu/natty/meld/natty-proposed

« back to all changes in this revision

Viewing changes to data/ui/filediff-ui.xml

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell, Iain Buclaw
  • Date: 2011-01-19 14:50:11 UTC
  • mfrom: (1.3.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110119145011-86jdurt5p9ovmdsh
Tags: 1.5.0-0ubuntu1
https://launchpad.net/bugs/703603
* New upstream release

[ Iain Buclaw ]
* debian/patches/diff_tree_store.patch:
  - Fix crash trying to insert integers into a text column (LP: #703603)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/ui/filediff-ui.xml
8
8
  </toolbar>
9
9
 
10
10
  <menubar name="Menubar">
 
11
    <menu action="FileMenu">
 
12
      <placeholder name="FileActionsPlaceholder">
 
13
        <menuitem action="MakePatch"/>
 
14
      </placeholder>
 
15
    </menu>
11
16
    <menu action="ChangesMenu">
12
17
      <placeholder name="ChangesActions">
 
18
        <menuitem action="PrevConflict"/>
 
19
        <menuitem action="NextConflict"/>
 
20
        <separator/>
13
21
        <menuitem action="PushLeft"/>
14
22
        <menuitem action="PushRight"/>
15
23
        <menuitem action="PullLeft"/>
16
24
        <menuitem action="PullRight"/>
17
25
        <menuitem action="Delete"/>
18
26
        <separator/>
 
27
        <menuitem action="CopyLeftUp"/>
 
28
        <menuitem action="CopyLeftDown"/>
 
29
        <menuitem action="CopyRightUp"/>
 
30
        <menuitem action="CopyRightDown"/>
 
31
        <separator/>
19
32
        <menuitem action="MergeFromLeft"/>
20
33
        <menuitem action="MergeFromRight"/>
21
34
        <menuitem action="MergeAll"/>
27
40
    <menuitem action="Save" />
28
41
    <menuitem action="SaveAs" />
29
42
    <separator/>
30
 
    <menuitem action="CreatePatch" />
31
 
    <separator/>
32
43
    <menuitem action="Cut" />
33
44
    <menuitem action="Copy" />
34
45
    <menuitem action="Paste" />