[w-scan] 02/05: Merge tag 'upstream/20161022'

[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 1da4f82d00fced6cda04d32e2c688b0c8493a7d9
Merge: fb9119b 822fdb4
Author: Tobias Grimm <git at e-tobi.net>
Date:   Sat Nov 5 09:57:31 2016 +0100

    Merge tag 'upstream/20161022'
    
    Upstream version 20161022

 ChangeLog      |  35 +++++
 config.h       |   6 +-
 configure      |  20 +--
 configure.in   |   2 +-
 countries.c    |  57 ++++++-
 countries.h    |   4 +
 descriptors.c  | 337 +++++++++++++++++++-----------------------
 diseqc.c       |   2 +-
 dump-vdr.c     | 221 +++++++++++++++++++--------
 dump-xml.c     |  10 +-
 emulate.c      | 163 ++++++++++++++++++--
 satellites.dat | 460 +++++++++++++++++++++++++++++++--------------------------
 satellites.h   |   1 +
 scan.c         | 308 ++++++++++++++++++++------------------
 si_types.h     |  29 ++--
 tools.c        |  82 +++++++++-
 tools.h        |   3 +-
 version.h      |   2 +-
 18 files changed, 1087 insertions(+), 655 deletions(-)

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