← Back to branch summary

~jtaylor/ubuntu/natty/meld/meld-sru

« back to all changes in this revision

Viewing changes to tree.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry, Michael Terry, James Westby
  • Date: 2009-05-07 15:11:34 UTC
  • mfrom: (1.2.8 upstream) (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090507151134-91styo8cxk9h1m52
Tags: 1.2.1-1ubuntu1
https://launchpad.net/bugs/373388
[ Michael Terry ]
* Merge from debian unstable (LP: #373388), remaining changes:
  - debian/control.in: Add patch as a dependency
  - debian/copyright: Update email address of maintainer
  - debian/patches/only-ignore-fully-blank-changes.patch
* debian/patches/escape-paths.patch:
  - Removed, fixed upstream.

[ James Westby ]
* debian/patches/fix-fr-help-makefile.patch
  - Removed as the directory now exists.
* Added patch tags to the remaining Ubuntu patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.py
14
14
### along with this program; if not, write to the Free Software
15
15
### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from __future__ import generators
18
17
import os
19
18
import gtk
20
19
import misc