[Reproducible-commits] [discount] 12/121: Merge commit 'upstream/2.0.6'

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository discount.

commit 1ffd0c3d0ede2b9cae23666b1ce4b6ccbc77974d
Merge: 4476df2 faa4de3
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Sat Feb 19 18:11:27 2011 +0100

    Merge commit 'upstream/2.0.6'

 VERSION                |  2 +-
 dumptree.c             |  2 +-
 flags.c                |  1 +
 generate.c             | 67 +++++++++++++++++++++++++++++++++++++++++++++++---
 main.c                 |  8 +++---
 markdown.c             |  7 ++++++
 markdown.h             | 10 +++++++-
 mkdio.c                |  2 +-
 mkdio.h.in             |  8 +++++-
 tests/extrafootnotes.t | 25 +++++++++++++++++++
 toc.c                  |  6 +++--
 11 files changed, 125 insertions(+), 13 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/discount.git