[vdr-plugin-markad] 02/07: Merge tag 'upstream/0.1.4+git20160709'

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

commit c11bf5e80321689529a3f0021afcab5686ebb24a
Merge: 7a87882 d7ec9af
Author: Tobias Grimm <git at e-tobi.net>
Date:   Sat Jul 9 20:29:28 2016 +0200

    Merge tag 'upstream/0.1.4+git20160709'
    
    Upstream version 0.1.4+git20160709

 command/decoder.cpp                                |   2 ++
 command/global.h                                   |   4 +++
 command/logos/Comedy_Central_VIVA-A16_9-P0.pgm     | Bin 0 -> 9714 bytes
 command/logos/Disney_Channel-A16_9-P0.pgm          | Bin 20180 -> 9618 bytes
 command/logos/Disney_Channel_HD-A4_3-P0.pgm        |   6 ++--
 command/logos/Fox_Serie-A16_9-P0.pgm               | Bin 19219 -> 7818 bytes
 ...l_HD-A4_3-P0.pgm => NICKELODEON_HD-A4_3-P0.pgm} |   4 +--
 command/markad-standalone.cpp                      |  36 ++++++++++++++++++---
 command/video.cpp                                  |   4 ++-
 9 files changed, 45 insertions(+), 11 deletions(-)

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