[vdr-plugin-remotetimers] 03/05: Merge branch 'upstream'

[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 7043968e3633afe8fcfc06ce771dc6bb275305c9
Merge: 62edb39 1b35e98
Author: etobi <git at e-tobi.net>
Date:   Tue Feb 10 09:49:08 2015 +0100

    Merge branch 'upstream'

 HISTORY                                            |   32 +-
 Makefile                                           |    2 +-
 README                                             |  107 +-
 conflict.c                                         |  137 ++
 conflict.h                                         |   81 +
 i18n.c                                             | 2340 --------------------
 i18n.h                                             |    6 -
 include/epgsearch.h                                |  202 ++
 menu.c                                             | 1272 +++--------
 menu.h                                             |   84 +-
 menuitems.c                                        |    2 -
 moverec.c                                          |    2 -
 ...dr-1.4.x-1.7.27-remote_instant_recordings.patch |  124 --
 .../vdr-1.5.15-1.7.9-video_on_networkshare.diff    |   33 -
 ...-skinlcars.patch => vdr-1.7.29-skinlcars.patch} |   12 +-
 po/de_DE.po                                        |  104 +-
 po/it_IT.po                                        |  101 +-
 po/sk_SK.po                                        |  115 +-
 remotetimers.c                                     |   58 +-
 remotetimers.h                                     |   49 +-
 setup.c                                            |   61 +-
 setup.h                                            |    5 +
 svdrp.c                                            |   17 +-
 svdrp.h                                            |    7 +-
 svdrpservice.h                                     |   40 +
 25 files changed, 1226 insertions(+), 3767 deletions(-)

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