[linuxtv-dvb-apps] 02/02: Merge tag 'upstream/1.1.1+rev1500'

[Jonathan McCrohan]

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

jmccrohan-guest pushed a commit to branch master
in repository linuxtv-dvb-apps.

commit 1516b6d1f29a58a818c1bea4ea255a8b782b7360
Merge: ba77747 60584e1
Author: Jonathan McCrohan <jmccrohan at gmail.com>
Date:   Tue Sep 17 00:36:06 2013 +0100

    Merge tag 'upstream/1.1.1+rev1500'
    
    Upstream version 1.1.1+rev1500

 .hg_archival.txt                                   |    4 +-
 lib/libucsi/dvb/mosaic_descriptor.h                |    3 -
 test/libesg/testesg.c                              |    2 +-
 test/libucsi/testucsi.c                            |    3 +-
 test/lock_s.c                                      |    4 +-
 test/test_av_play.c                                |   18 +-
 test/test_video.c                                  |   14 +-
 util/lsdvb/lsdvb.c                                 |    2 +-
 util/scan/Makefile                                 |    2 +-
 util/scan/dvb-t/ar-Argentina                       |   63 ++++++
 util/scan/dvb-t/br-Brazil                          |   63 ++++++
 util/scan/dvb-t/cz-All                             |   41 ++--
 util/scan/dvb-t/hu-Bekescsaba                      |   24 ++-
 util/scan/dvb-t/hu-Budapest                        |   24 ++-
 util/scan/dvb-t/hu-Csavoly-Kiskoros                |   22 +-
 util/scan/dvb-t/hu-Debrecen-Komadi                 |   21 ++
 util/scan/dvb-t/hu-Fehergyarmat                    |   21 ++
 util/scan/dvb-t/hu-Gerecse                         |   17 --
 util/scan/dvb-t/hu-Gerecse-Dorog-Tatabanya         |   21 ++
 util/scan/dvb-t/hu-Gyor                            |   21 ++
 util/scan/dvb-t/hu-Gyor-Tatabanya                  |   17 --
 util/scan/dvb-t/hu-Kabhegy-Kaposvar-Tamasi         |   21 ++
 util/scan/dvb-t/hu-Kabhegy-Mor-Siofok              |   17 --
 ...deg-hegy-Balassagyarmat-Godollo-Salgotarjan-Vac |   21 ++
 util/scan/dvb-t/hu-Karcag                          |   22 +-
 util/scan/dvb-t/hu-Kecskemet                       |   21 ++
 .../dvb-t/hu-Kekes-Cegled-Eger-Miskolctapolca-Ozd  |   21 ++
 util/scan/dvb-t/hu-Kekes-Ozd                       |   17 --
 util/scan/dvb-t/hu-Kiskoros                        |   17 --
 util/scan/dvb-t/hu-Komadi-Debrecen                 |   17 --
 util/scan/dvb-t/hu-Miskolc-Aggtelek-Fony           |   21 ++
 util/scan/dvb-t/hu-Mor-Siofok-Veszprem-Zirc        |   21 ++
 util/scan/dvb-t/hu-Nagykanizsa-Barcs-Keszthely     |   21 ++
 util/scan/dvb-t/hu-Nagykanizsa-Kaposvar            |   17 --
 ...gyhaza-Tokaj-Kazincbarcika-Saly-Satoraljaujhely |   21 ++
 util/scan/dvb-t/hu-Pecs-Siklos                     |   21 ++
 util/scan/dvb-t/hu-Pecs-Uzd                        |   17 --
 util/scan/dvb-t/hu-Salgotarjan                     |   17 --
 util/scan/dvb-t/hu-Sopron                          |   17 --
 util/scan/dvb-t/hu-Sopron-Koszeg                   |   21 ++
 util/scan/dvb-t/hu-Szeged                          |   21 ++
 util/scan/dvb-t/hu-Szekesfehervar                  |   21 ++
 util/scan/dvb-t/hu-Szentes-Battonya                |   21 ++
 util/scan/dvb-t/hu-Szentes-Szeged                  |   17 --
 util/scan/dvb-t/hu-Szolnok                         |   21 ++
 .../dvb-t/hu-Szombathely-Vasvar-Lenti-Zalaegerszeg |   21 ++
 util/scan/dvb-t/hu-Tokaj-Kazincbarcika             |   17 --
 .../hu-Uzd-Bonyhad-Dunaujvaros-Szekszard-Szigetvar |   21 ++
 util/scan/dvb-t/hu-Vasvar                          |   17 --
 util/scan/scan.c                                   |    4 +-
 util/szap/azap.c                                   |   18 +-
 util/szap/czap.c                                   |   24 +--
 util/szap/szap.c                                   |   20 +-
 util/szap/tzap.c                                   |   24 +--
 util/szap/util.c                                   |  224 ++++++++++++++++++++
 util/szap/util.h                                   |    4 +
 56 files changed, 914 insertions(+), 356 deletions(-)

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