[vdr-plugin-satip] 02/03: Merge tag 'upstream/2.2.0'

[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-satip.

commit 0219b128e267798eea39b6799ce755736f7a4cf4
Merge: 1f47ad1 0435b8b
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 1 19:59:53 2015 +0100

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0

 HISTORY     |  12 +++
 README      |   8 +-
 device.c    |  14 +--
 discover.c  |  52 +++++++---
 discover.h  |  10 +-
 msearch.c   |   3 +-
 param.c     |   8 +-
 po/ca_ES.po |   6 +-
 po/de_DE.po |   6 +-
 po/es_ES.po |   6 +-
 po/fi_FI.po |   6 +-
 rtcp.c      |   4 +-
 rtp.c       |   5 +-
 satip.c     |   8 +-
 server.c    | 334 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 server.h    | 113 ++++++++++++--------
 setup.c     |   2 +-
 socket.c    |  15 +--
 tuner.c     |  48 +++++----
 tuner.h     |  60 ++++++-----
 20 files changed, 482 insertions(+), 238 deletions(-)

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