[vdr-plugin-iptv] 02/03: Merge tag 'upstream/2.2.1'

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository vdr-plugin-iptv.

commit 6963b883696818dd2a616a7b382689ba24e6be00
Merge: e4794aa 0e6334d
Author: etobi <git at e-tobi.net>
Date:   Thu Sep 3 18:53:00 2015 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 HISTORY         | 10 +++++-
 Makefile        | 15 +--------
 common.h        | 28 ++++++-----------
 config.c        |  8 +++--
 config.h        | 24 +++++++++++++++
 device.c        | 62 ++++++++++++++++++-------------------
 iptv.c          | 57 +++++++++++++++++++++-------------
 log.h           | 48 +++++++++++++++++++++++++++++
 pidscanner.c    | 20 ++++++------
 pidscanner.h    |  6 ++--
 po/de_DE.po     |  6 ++--
 po/fi_FI.po     |  6 ++--
 po/fr_FR.po     |  6 ++--
 po/it_IT.po     |  6 ++--
 po/lt_LT.po     |  6 ++--
 po/nl_NL.po     |  6 ++--
 po/ru_RU.po     |  6 ++--
 protocolcurl.c  | 95 ++++++++++++++++++++++++++++++++++++++-------------------
 protocolcurl.h  |  3 ++
 protocolext.c   | 25 +++++++--------
 protocolfile.c  | 23 +++++++-------
 protocolhttp.c  | 25 +++++++--------
 protocoludp.c   | 17 ++++++-----
 sectionfilter.c | 33 ++++++++++----------
 setup.c         |  6 ++--
 sidscanner.c    | 20 ++++++------
 sidscanner.h    |  6 ++--
 socket.c        | 57 +++++++++++++++++-----------------
 source.c        | 16 +++++-----
 statistics.c    | 37 +++++++++++-----------
 streamer.c      | 19 ++++++------
 31 files changed, 411 insertions(+), 291 deletions(-)

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