diff options
| author | David Bremner <bremner@debian.org> | 2011-07-17 22:18:58 -0300 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2011-07-17 22:20:37 -0300 |
| commit | a900ddaba661d693764d1a5f58f8b946bb788c4a (patch) | |
| tree | 8801ce742859943f2552e328c0e14572846a7160 /debian/source | |
| parent | 8b10e4d56980037e388bf07c27899e34386c28f6 (diff) | |
| parent | 2d69aba586b52566f322a347d459503d53de6ce6 (diff) | |
Merge commit '0.6.1'
Conflicts:
lib/Makefile.local
The conflicts are from three kinds of commits not merged into release:
- typo fixes
- removal of debug output
- fix for CLEAN rule
That were never merged into the release branch.
Diffstat (limited to 'debian/source')
| -rw-r--r-- | debian/source/format | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/source/format b/debian/source/format index 89ae9db8..163aaf8d 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) |