← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-13 01:32:26 UTC
  • mfrom: (5606 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5607.
  • Revision ID: jelmer@samba.org-20110113013226-1d41bwtmps9y68wm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
395
395
    # ditto for the tbzrcommand tool
396
396
    tbzrcommand = dict(
397
397
        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
398
 
        icon_resources = [(0,'bzr.ico')],
 
398
        icon_resources = icon_resources,
 
399
        other_resources = other_resources,
399
400
    )
400
401
    console_targets.append(tbzrcommand)
401
402
    tbzrcommandw = tbzrcommand.copy()