[vdr-plugin-epgsearch] 06/08: Merge tag 'upstream/1.0.1_beta6+git20150211'

[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 6c8962f3cf6c9e60b07c1f2c304ea041bc538fb4
Merge: 4f8fd9b 9ddfc0f
Author: etobi <git at e-tobi.net>
Date:   Wed Feb 11 22:54:34 2015 +0100

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

 .gitignore         | 14 ++++++++++++++
 MANUAL             |  1 -
 Makefile           | 10 +++++++++-
 README.DE          |  1 -
 blacklist.c        |  2 +-
 changrp.c          |  2 +-
 epgsearchext.c     |  4 ++--
 epgsearchtools.c   |  2 +-
 menu_favorites.c   | 22 ++++++++++++++++++++++
 menu_favorites.h   |  4 ++++
 menu_myedittimer.c |  2 +-
 switchtimer.c      |  2 +-
 uservars.h         |  4 ++++
 13 files changed, 60 insertions(+), 10 deletions(-)

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