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

[Frank Neumann]

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

fnu-guest pushed a commit to branch master
in repository vdr-plugin-satip.

commit 5ac2cd614c71ab041f5adda54f57724b683f6e5f
Merge: d28dac1 caa6d38
Author: Frank Neumann <fnu at yavdr.org>
Date:   Sat Nov 21 19:57:50 2015 +0100

    Merge tag 'upstream/2.2.3'
    
    Upstream version 2.2.3

 HISTORY      |  7 +++++++
 device.c     | 19 ++++++++++++++++++-
 device.h     |  3 ++-
 deviceif.h   |  3 ++-
 discoverif.h |  2 +-
 msearch.h    |  2 +-
 po/ca_ES.po  |  2 +-
 po/de_DE.po  |  2 +-
 po/es_ES.po  |  2 +-
 po/fi_FI.po  |  2 +-
 pollerif.h   |  2 +-
 rtcp.c       |  2 +-
 rtcp.h       |  2 +-
 rtp.h        |  2 +-
 rtsp.h       |  2 +-
 satip.c      |  2 +-
 server.c     |  8 ++++++--
 setup.c      |  4 ++--
 tuner.c      | 24 ++++++++++++++++++++++--
 tuner.h      |  2 ++
 tunerif.h    |  2 +-
 21 files changed, 74 insertions(+), 22 deletions(-)

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