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

commit 80c623a4eb845a165d99e9649da32a3e61d1a23d
Merge: 410d055 4023c60
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 9 19:36:34 2015 +0100

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4

 HISTORY               |  14 +++-
 extrecmenu.c          |  15 +++--
 mymenueditrecording.c |  20 ++++++
 mymenurecordings.c    | 183 +++++++++++++++++++++++++++++++++++---------------
 mymenurecordings.h    |  12 +++-
 mymenusetup.c         |  45 ++++++++++++-
 mymenusetup.h         |   8 +++
 myreplaycontrol.c     |   3 +
 po/ca_ES.po           |   5 +-
 po/cs_CZ.po           |   5 +-
 po/da_DK.po           |   5 +-
 po/de_DE.po           |   9 ++-
 po/el_GR.po           |   5 +-
 po/es_ES.po           |  60 +++++++++--------
 po/et_EE.po           |   5 +-
 po/fi_FI.po           |   5 +-
 po/fr_FR.po           | 130 ++++++++++++++++++-----------------
 po/hr_HR.po           |   5 +-
 po/hu_HU.po           |   5 +-
 po/it_IT.po           |   5 +-
 po/nl_NL.po           |   5 +-
 po/nn_NO.po           |   5 +-
 po/pl_PL.po           |   5 +-
 po/pt_PT.po           |   5 +-
 po/ro_RO.po           |   5 +-
 po/ru_RU.po           |   5 +-
 po/sk_SK.po           |   5 +-
 po/sl_SI.po           |   5 +-
 po/sv_SE.po           |   5 +-
 po/tr_TR.po           |   5 +-
 tools.c               |  67 +++++++++++-------
 tools.h               |   3 +
 32 files changed, 466 insertions(+), 198 deletions(-)

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