[vdr-plugin-epgsearch] 02/16: Merge tag 'upstream/1.0.1_beta6+git20151104'

[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 3b53bafff36b0e000722803ef587760b8386d580
Merge: 27a7c09 61c2053
Author: Tobias Grimm <etobi at debian.org>
Date:   Sun Jan 8 09:59:28 2017 +0100

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

 MANUAL                                        |   1 +
 Makefile                                      |   2 +-
 README                                        |   2 +-
 README.DE                                     |   1 +
 blacklist.c                                   |  51 ++++++--
 blacklist.h                                   |  10 +-
 changrp.c                                     |  60 ++++++---
 changrp.h                                     |   6 +-
 conflictcheck.c                               |  41 ++++--
 conflictcheck.h                               |  17 ++-
 conflictcheck_thread.c                        |   2 +
 epgsearch.c                                   |  40 ++++--
 epgsearchext.c                                |  95 ++++++++++----
 epgsearchext.h                                |  12 +-
 epgsearchsvdrp.c                              |  44 +++++--
 epgsearchtools.c                              |  21 ++-
 epgsearchtools.h                              |  10 +-
 mail.c                                        |  37 +++++-
 mail.h                                        |   4 +-
 menu_blacklistedit.c                          |  10 +-
 menu_commands.c                               |  41 ++++--
 menu_conflictcheck.c                          |  83 +++++++++---
 menu_conflictcheck.h                          |   4 +-
 menu_deftimercheckmethod.c                    |  18 ++-
 menu_dirselect.c                              |  16 ++-
 menu_event.c                                  |  28 +++-
 menu_favorites.c                              |   8 +-
 menu_main.c                                   |  97 +++++++++++---
 menu_main.h                                   |   4 +-
 menu_myedittimer.c                            |  75 +++++++++--
 menu_quicksearch.c                            |  10 +-
 menu_searchedit.c                             |  10 +-
 menu_searchresults.c                          |  96 +++++++++++---
 menu_searchresults.h                          |   8 +-
 menu_switchtimers.c                           |   8 +-
 menu_templateedit.c                           |  10 +-
 menu_timersdone.c                             |   8 +-
 menu_whatson.c                                | 102 +++++++++++----
 menu_whatson.h                                |  16 +--
 patches/vdr.epgsearch-exttimeredit-2.3.1.diff | 114 +++++++++++++++++
 pending_notifications.c                       |   8 +-
 recdone.c                                     |  18 ++-
 recdone.h                                     |   2 +-
 recstatus.c                                   |  26 +++-
 recstatus.h                                   |  11 +-
 searchtimer_thread.c                          | 114 +++++++++++++----
 searchtimer_thread.h                          |  12 +-
 services.c                                    |  16 ++-
 recstatus.c => status_thread.c                | 177 ++++++++++++--------------
 recstatus.h => status_thread.h                |  52 +++++---
 switchtimer.c                                 |  17 ++-
 switchtimer_thread.c                          |  10 +-
 templatefile.c                                |   6 +
 timer_thread.c                                |   6 +
 timerdone.c                                   |  21 ++-
 uservars.h                                    |  42 +++++-
 56 files changed, 1337 insertions(+), 423 deletions(-)

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