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

[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 414f2f1291f3611704bfed52a44c6fdae5c695dc
Merge: 007adcf d084f4a
Author: Frank Neumann <fnu at yavdr.org>
Date:   Sun Apr 26 12:37:58 2015 +0200

    Merge tag 'upstream/2.2.2'
    
    Upstream version 2.2.2

 HISTORY     |  7 +++++++
 README      |  2 +-
 config.c    |  1 +
 config.h    |  3 +++
 device.c    |  4 ++++
 po/ca_ES.po |  6 +++---
 po/de_DE.po |  6 +++---
 po/es_ES.po |  6 +++---
 po/fi_FI.po |  6 +++---
 satip.c     | 44 +++++++++++++++++++++++++++++++++++++-------
 setup.c     | 20 ++++++++++++--------
 setup.h     |  1 +
 12 files changed, 78 insertions(+), 28 deletions(-)

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