[vdr-plugin-dummydevice] 02/03: Merge tag 'upstream/2.0.0'

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

commit d882c8a2c507d214161c39a3c70a9a38e82bdb27
Merge: 6bdcaab 4c22b27
Author: etobi <git at e-tobi.net>
Date:   Mon Feb 9 19:11:03 2015 +0100

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0

 HISTORY                         |  3 ++
 Makefile                        | 92 +++++++++++++++++++++++++++++------------
 Makefile => Makefile.vdr-1.7.37 |  0
 README                          |  4 +-
 dummydevice.c                   | 55 ++++--------------------
 5 files changed, 80 insertions(+), 74 deletions(-)

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