[vdr-plugin-epgsearch] 03/08: Merge tag 'upstream/1.0.1_beta6'

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

commit 136e8730abf3ec33d5f11df6e68f8c322a7761d8
Merge: 2038e8a 3b7c364
Author: etobi <git at e-tobi.net>
Date:   Wed Feb 11 22:51:28 2015 +0100

    Merge tag 'upstream/1.0.1_beta6'
    
    Upstream version 1.0.1~beta6

 HISTORY                            |   5 +-
 HISTORY.DE                         |   5 +-
 Makefile                           | 173 ++++++++++++++++++++-----------------
 Makefile => Makefile.before.1.7.36 |   0
 conflictcheck.c                    |   2 +-
 epgsearch.c                        |  10 +--
 menu_conflictcheck.c               |   8 +-
 menu_dirselect.c                   |   4 +-
 po/ca_ES.po                        |  18 +---
 po/cs_CZ.po                        |  21 ++---
 po/da_DK.po                        |  18 +---
 po/de_DE.po                        |  21 ++---
 po/el_GR.po                        |  18 +---
 po/es_ES.po                        |  21 ++---
 po/et_EE.po                        |  18 +---
 po/fi_FI.po                        |  21 ++---
 po/fr_FR.po                        |  21 ++---
 po/hr_HR.po                        |  18 +---
 po/hu_HU.po                        |  18 +---
 po/it_IT.po                        |  21 ++---
 po/lt_LT.po                        |  21 ++---
 po/nl_NL.po                        |  21 ++---
 po/nn_NO.po                        |  18 +---
 po/pl_PL.po                        |  18 +---
 po/pt_PT.po                        |  18 +---
 po/ro_RO.po                        |  18 +---
 po/ru_RU.po                        |  18 +---
 po/sk_SK.po                        |  21 ++---
 po/sl_SI.po                        |  18 +---
 po/sv_SE.po                        |  18 +---
 po/tr_TR.po                        |  18 +---
 uservars.h                         |   2 +-
 32 files changed, 238 insertions(+), 412 deletions(-)

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