[vdr-plugin-remotetimers] 02/03: Merge tag 'upstream/1.0.2'

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

commit c49ccf83cee9f887fc00e6cc9a14081c96cb0956
Merge: 940e7ac 47b27ae
Author: etobi <git at e-tobi.net>
Date:   Thu Sep 3 19:03:59 2015 +0200

    Merge tag 'upstream/1.0.2'
    
    Upstream version 1.0.2

 HISTORY                                            |  8 +++++
 Makefile                                           |  3 ++
 menu.c                                             | 34 ++++++++++++++++++++++
 menu.h                                             | 13 +++++++++
 ...f => vdr-1.6.0-2.0.3-MainMenuHooks-v1_0_2.diff} |  0
 ..._2.diff => vdr-2.0.4-MainMenuHooks-v1_0_2.diff} |  4 +--
 remotetimers.c                                     | 14 ++++++++-
 watcher.c                                          |  8 +++++
 8 files changed, 81 insertions(+), 3 deletions(-)

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