[vdr-plugin-femon] 03/04: Merge tag 'upstream/2.0.4'

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

commit a674fdcc7fe668a5b94e060d30b0c4633da6d4b5
Merge: d85b8d3 de92459
Author: etobi <git at e-tobi.net>
Date:   Mon Oct 27 19:21:47 2014 +0100

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4

 HISTORY                               |  17 +++++
 Makefile                              |   2 +-
 femon.c                               |  10 +--
 femonclient/vdr-femonclient-0.0.5.tgz | Bin 9264 -> 0 bytes
 femonclient/vdr-femonclient-0.0.6.tgz | Bin 0 -> 9294 bytes
 femonosd.c                            | 121 ++++++++++++++++++++++++++++------
 femonsymbol.c                         |  88 +++++++++++++------------
 femonsymbol.h                         |   5 +-
 femontools.c                          |   1 +
 femontools.h                          |   2 +
 po/de_DE.po                           |   8 +--
 po/es_ES.po                           |   8 +--
 po/et_EE.po                           |   8 +--
 po/fi_FI.po                           |   8 +--
 po/fr_FR.po                           |   8 +--
 po/hu_HU.po                           |   8 +--
 po/it_IT.po                           |   8 +--
 po/lt_LT.po                           |   8 +--
 po/ru_RU.po                           |   8 +--
 po/sk_SK.po                           |   9 ++-
 po/uk_UA.po                           |  28 +++-----
 po/zh_CN.po                           |   8 +--
 po/zh_TW.po                           |   8 +--
 23 files changed, 231 insertions(+), 140 deletions(-)

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