~jr/bzr-explorer/unstable

« back to all changes in this revision

Viewing changes to lib/kinds.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-10 13:30:56 UTC
  • mfrom: (361.1.1 bzr-explorer-unstable)
  • Revision ID: jriddell@canonical.com-20110610133056-zrr83g9yoq4ogjby
merge in 1.1.3 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
363
363
    COLLAPSE_ALL_ACTION:"actions/media-skip-backward",
364
364
    COMMIT_ACTION:      "actions/go-last",
365
365
    CONFLICTS_ACTION:   "status/software-update-urgent",
366
 
    DELETE_ACTION:      "actions/edit-delete",
 
366
    DELETE_ACTION:      "places/user-trash",
367
367
    DIFF_ACTION:        "apps/preferences-system-windows",
368
368
    EDIT_ACTION:        "apps/accessories-text-editor",
369
369
    EXPAND_ALL_ACTION:  "actions/media-skip-forward",