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

[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 430871d335e174b18e75069a77fe65b447e4b3ef
Merge: 263f0c6 d23475b
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 9 19:39:56 2015 +0100

    Merge tag 'upstream/2.1.3'
    
    Upstream version 2.1.3

 HISTORY         |  41 ++++++++++++
 Makefile        |   6 +-
 README          |  32 +++++----
 common.c        |  14 ++--
 common.h        |   7 +-
 config.c        |  11 +++-
 config.h        |  15 ++---
 device.c        | 166 ++++++++++++++++++++++++++++------------------
 device.h        |  17 +++--
 iptv.c          |  27 ++++----
 pidscanner.c    |   1 -
 pidscanner.h    |   8 +++
 po/de_DE.po     |  50 +++-----------
 po/fi_FI.po     |  60 ++++-------------
 po/fr_FR.po     |  60 ++++-------------
 po/it_IT.po     |  60 ++++-------------
 po/nl_NL.po     |  60 ++++-------------
 po/ru_RU.po     |  50 +++-----------
 protocolcurl.c  | 200 ++++++++++++++++++++++++++++++++++++++------------------
 protocolcurl.h  |  13 ++--
 protocolext.c   |  12 +++-
 protocolext.h   |   3 +-
 protocolfile.c  |   8 ++-
 protocolfile.h  |   3 +-
 protocolhttp.c  |   8 ++-
 protocolhttp.h  |   3 +-
 protocolif.h    |   3 +-
 protocoludp.c   |   8 ++-
 protocoludp.h   |   3 +-
 sectionfilter.c |  92 +++++++++++++++++++-------
 sectionfilter.h |  27 ++++----
 setup.c         |  24 ++-----
 setup.h         |   4 +-
 sidscanner.c    |  14 ++--
 socket.c        |  27 +++++++-
 socket.h        |   6 ++
 source.c        |  25 +++----
 source.h        |   2 -
 statistics.c    |  32 +++++----
 statistics.h    |   6 +-
 streamer.c      |  14 +++-
 streamer.h      |   3 +-
 42 files changed, 657 insertions(+), 568 deletions(-)

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