[w-scan] 02/04: Merge tag 'upstream/20141122'

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository w-scan.

commit d95a1391c8927d935b13e0e9323436be92233f57
Merge: c44df0b fea1d5c
Author: etobi <git at e-tobi.net>
Date:   Sat Dec 27 11:23:26 2014 +0100

    Merge tag 'upstream/20141122'
    
    Upstream version 20141122

 ChangeLog     |  9 +++++++++
 Makefile.am   |  2 +-
 Makefile.in   |  3 ++-
 config.h      |  6 +++---
 configure     | 20 ++++++++++----------
 configure.in  |  2 +-
 descriptors.c | 24 +++++++++++++-----------
 descriptors.h |  1 +
 scan.c        | 42 +++++++++++++++++++++++++++---------------
 version.h     |  2 +-
 10 files changed, 68 insertions(+), 43 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/w-scan.git