[vdr-plugin-pvrinput] 02/04: Merge tag 'upstream/2014-01-11+git20150213'

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

commit b86207483eadf0f8089db55a9391c5cd4c8b01f3
Merge: 6f8a962 a044c87
Author: etobi <git at e-tobi.net>
Date:   Fri Feb 13 22:03:28 2015 +0100

    Merge tag 'upstream/2014-01-11+git20150213'
    
    Upstream version 2014-01-11+git20150213

 Makefile   |   7 +-
 device.c   | 179 ++++++++++++++++++++++++++++------------------
 device.h   |   7 +-
 pvrinput.c |   2 +-
 udev.c     | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 udev.h     |  56 +++++++++++++++
 6 files changed, 411 insertions(+), 76 deletions(-)

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