[vdr-plugin-radio] 02/03: Merge tag 'upstream/1.0.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-radio.

commit 9273cbd96b29ac4beae7141202c06206bc07ce83
Merge: ef0471d 5674e6f
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 9 19:49:50 2015 +0100

    Merge tag 'upstream/1.0.0'
    
    Upstream version 1.0.0

 HISTORY                                            |   6 +
 config/mpegstill/radio-OnAir1080.mpg               | Bin 0 -> 135384 bytes
 config/mpegstill/radio-Red1080.mpg                 | Bin 0 -> 109074 bytes
 config/mpegstill/radio-Tubes1080.mpg               | Bin 0 -> 138345 bytes
 config/mpegstill/radio.mpg                         |   2 +-
 config/scripts/radioinfo-1113-354                  |   4 +-
 ...{radioinfo-1113-354 => radioinfo-1113-354.utf8} |   0
 config/scripts/radioinfo-7-304                     |   3 +-
 .../{radioinfo-7-304 => radioinfo-7-304.utf8}      |   0
 inforx.c                                           |   4 +-
 po/de_DE.po                                        |   8 +-
 po/fi_FI.po                                        |   8 +-
 po/fr_FR.po                                        |   8 +-
 po/hu_HU.po                                        |   8 +-
 po/it_IT.po                                        |   8 +-
 radio.c                                            |   7 +-
 radioaudio.c                                       |  13 +-
 radioaudio.h                                       |   1 +
 radioepg.c                                         | 133 +++++++++++++++------
 radioepg.h                                         |  13 +-
 radiotools.c                                       |   2 +-
 21 files changed, 158 insertions(+), 70 deletions(-)

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