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

[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 393c09ae1df439856622d511b0ad458adde16978
Merge: 9739cb7 866c02c
Author: Frank Neumann <fnu at yavdr.org>
Date:   Sat Apr 25 21:23:50 2015 +0200

    Merge tag 'upstream/2.2.1'
    
    Upstream version 2.2.1

 HISTORY     |  10 ++++
 Makefile    |  17 +-----
 common.h    |  64 ++++++++++++++++++---
 config.h    |  36 ++++++------
 discover.c  |  76 +++++++++++++------------
 discover.h  |  14 +++--
 log.h       |   5 +-
 msearch.c   |   7 ++-
 param.c     |  18 +++---
 po/ca_ES.po |   6 +-
 po/de_DE.po |   6 +-
 po/es_ES.po |   6 +-
 po/fi_FI.po |   6 +-
 rtsp.c      | 185 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 rtsp.h      |  12 +++-
 satip.c     |   2 +-
 16 files changed, 324 insertions(+), 146 deletions(-)

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