~marienz/bzr-builddeb/initial-merge-upstream

« back to all changes in this revision

Viewing changes to debian/changelog

  • Committer: James Westby
  • Date: 2009-08-24 17:38:49 UTC
  • Revision ID: james.westby@canonical.com-20090824173849-6j8fyt1olwvwu3ls
Update changelog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
  * Automatically use merge mode if there's only a debian/ directory in
5
5
    the packaging branch. Closes: #529816.
6
6
 
 
7
  [ James Westby ]
 
8
  * Merge merge-package command from Muharem Hrnjadovic to allow merging
 
9
    another branch of the same package in a way that will avoid spurious
 
10
    conflicts from divergent upstream histories. Thanks Muharem.
 
11
 
7
12
 -- James Westby <james.westby@ubuntu.com>  Sun, 26 Jul 2009 18:38:47 +0200
8
13
 
9
14
bzr-builddeb (2.2~ubuntu2) karmic; urgency=low