[vdr] 02/09: Merge tag 'upstream/2.0.6'

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.0.6-1_etobi1
in repository vdr.

commit 4e18fbffe89f1eebaead5b833ae39981a1c3abd8
Merge: 965766d ed6f1dd
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 19 12:53:22 2014 +0200

    Merge tag 'upstream/2.0.6'
    
    Upstream version 2.0.6

 CONTRIBUTORS                            |  53 +++++++++++-
 HISTORY                                 |  84 ++++++++++++++++++++
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   6 +-
 PLUGINS/src/osddemo/HISTORY             |   5 ++
 PLUGINS/src/osddemo/osddemo.c           |  10 ++-
 channels.c                              |  16 ++--
 ci.c                                    |   4 +-
 config.h                                |  10 +--
 device.c                                |   5 +-
 dvbdevice.c                             |   2 +-
 eit.c                                   |   4 +-
 font.c                                  |  23 +++---
 font.h                                  |   4 +-
 lirc.c                                  |  19 +++--
 menu.c                                  |  32 +++++---
 menu.h                                  |   4 +-
 nit.c                                   |   8 +-
 nit.h                                   |   6 +-
 pat.c                                   | 133 ++++++++++++++++++-------------
 pat.h                                   |  20 +++--
 recorder.c                              |  12 +--
 recording.c                             |  83 +++++++++++++------
 recording.h                             |   8 +-
 remote.c                                |   4 +-
 remux.c                                 |  98 ++++++++++++++++++-----
 remux.h                                 |  13 ++-
 sdt.c                                   |  27 +++++--
 sdt.h                                   |   5 +-
 skinlcars.c                             |  14 +++-
 skins.h                                 |   4 +-
 sourceparams.c                          |   6 +-
 sources.c                               |  11 ++-
 sources.conf                            | 137 ++++++++++++++++----------------
 sources.h                               |   3 +-
 vdr.1                                   |   4 +-
 vdr.c                                   |  12 +--
 37 files changed, 615 insertions(+), 278 deletions(-)

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