[vdr-plugin-live] 07/08: Merge tag 'upstream/0.3.0+git20141029'

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

commit 25b0daf50fa8f490c86a0a2f41846902ec3bda9f
Merge: 4c746f6 ce572d5
Author: etobi <git at e-tobi.net>
Date:   Wed Oct 29 22:53:09 2014 +0100

    Merge tag 'upstream/0.3.0+git20141029'
    
    Upstream version 0.3.0+git20141029

 .gitignore               |  14 ++
 pages/content.ecpp       |   4 +
 pages/edit_timer.ecpp    |   8 +-
 pages/multischedule.ecpp | 404 ++++++++++++++++++++++++-----------------------
 pages/recordings.ecpp    |   4 +
 pages/timers.ecpp        |   2 +
 tntconfig.cpp            | 166 ++++++++++++-------
 tntfeatures.h            |  12 ++
 8 files changed, 355 insertions(+), 259 deletions(-)

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