-
Committer:
Bazaar Package Importer
-
Author(s):
Gauvain Pocentek
-
Date:
2009-01-01 18:40:50 UTC
-
mfrom:
(1.1.8 upstream)
(3.1.2 experimental)
-
Revision ID:
james.westby@ubuntu.com-20090101184050-u635kualu7amyt4a
Tags: 0.15-1ubuntu1
* Merge from debian experimental, remaining change:
- patches/20_add_debdiff_as_diff_type.dpatch: Also recognize .dpatch files
as diff's
- debian/geany.xpm: Replace icon with a .xpm of the new one