[Reproducible-commits] [discount] 33/121: Merge commit 'upstream/2.1.0'

[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 6aa40a2815a4ba110e90de6e24241de0c51a3256
Merge: 79c93eb 53750f4
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed Jul 13 20:34:31 2011 +0200

    Merge commit 'upstream/2.1.0'

 Makefile.in             |  27 +++++--
 VERSION                 |   2 +-
 configure.inc           | 170 +++++++++++++++++++++++---------------------
 main.c                  | 131 +++++-----------------------------
 makepage.1              |  11 +++
 makepage.c              |  64 ++++++++++++++++-
 mkdio.h.in              |   1 +
 main.c => pgm_options.c | 184 ++++--------------------------------------------
 pgm_options.h           |   9 +++
 theme.1                 |  18 ++++-
 theme.c                 |   8 ++-
 11 files changed, 246 insertions(+), 379 deletions(-)

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