[vdr] 04/08: Merge tag 'upstream/2.0.2'

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

commit 3f57b969c2d8da0333c889ec3957fd6d93baaecd
Merge: ffa9124 512d024
Author: etobi <git at e-tobi.net>
Date:   Sat May 25 09:06:06 2013 +0200

    Merge tag 'upstream/2.0.2'
    
    Upstream version 2.0.2

 CONTRIBUTORS |   11 ++++++++++-
 HISTORY      |   20 +++++++++++++++++++-
 config.h     |    6 +++---
 cutter.c     |    4 ++--
 diseqc.c     |    4 ++--
 menu.c       |   14 +++++++-------
 newplugin    |    6 +++---
 osd.c        |   10 +++++-----
 skinlcars.c  |    4 +++-
 9 files changed, 54 insertions(+), 25 deletions(-)

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