[w-scan] 05/08: Merge tag 'upstream/20140727'

[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 d3cce622efc3eacb52828167f33f96431d9d48a4
Merge: 7a2140e 811ca9d
Author: etobi <git at e-tobi.net>
Date:   Mon Oct 27 19:31:19 2014 +0100

    Merge tag 'upstream/20140727'
    
    Upstream version 20140727

 ChangeLog                   |   67 +
 Makefile.am                 |   10 +-
 Makefile.in                 |   29 +-
 README                      |    2 +-
 atsc_psip_section.c         |    4 +-
 atsc_psip_section.h         |    4 +-
 char-coding.c               |    4 +-
 char-coding.h               |    2 +-
 config.h                    |    6 +-
 configure                   |   20 +-
 configure.in                |    2 +-
 countries.c                 |    2 +-
 countries.h                 |    2 +-
 descriptors.c               | 3557 +++++++++++-----------
 descriptors.h               |    4 +-
 diseqc.c                    |  160 +-
 diseqc.h                    |    4 +
 doc/service_list.dtd        |  589 ++++
 doc/services.xml            |   39 +
 dump-dvbscan.c              |   68 +-
 dump-dvbscan.h              |    2 +-
 dump-kaffeine.c             |  349 ---
 dump-kaffeine.h             |   41 -
 dump-mplayer.c              |    4 +-
 dump-mplayer.h              |    2 +-
 dump-vdr.c                  |   67 +-
 dump-vdr.h                  |    3 +-
 dump-vlc-m3u.c              |  612 ++--
 dump-vlc-m3u.h              |   20 +-
 dump-xine.c                 |  147 +-
 dump-xine.h                 |   17 +-
 dump-xml.c                  |  318 ++
 iconv_codes.h => dump-xml.h |   67 +-
 dvbscan.c                   |    4 +-
 dvbscan.h                   |    2 +-
 emulate.c                   |  943 ++++++
 emulate.h                   |   27 +
 extended_frontend.h         |  128 +-
 iconv_codes.c               |    2 +-
 iconv_codes.h               |    2 +-
 list.h                      |  165 --
 lnb.c                       |   17 +-
 parse-dvbscan.c             |  118 +-
 parse-dvbscan.h             |    2 +-
 satellites.c                |   42 +-
 satellites.dat              |  348 +--
 satellites.h                |    6 +-
 scan.c                      | 6800 ++++++++++++++++++++++++-------------------
 scan.h                      |  140 +-
 section.c                   |    2 +-
 section.h                   |    2 +-
 si_types.h                  |  210 ++
 tools.c                     |  670 +++++
 tools.h                     |  136 +
 version.h                   |    2 +-
 55 files changed, 9590 insertions(+), 6402 deletions(-)

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