[vdr-plugin-streamdev] 02/03: Merge tag 'upstream/0.6.1+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-streamdev.

commit 584592676798d5203bae61e77fb6883cfccdc700
Merge: 5e6b1a4 2d25136
Author: etobi <git at e-tobi.net>
Date:   Fri Feb 13 23:55:58 2015 +0100

    Merge tag 'upstream/0.6.1+git20150213'
    
    Upstream version 0.6.1+git20150213

 CONTRIBUTORS              |   22 +-
 HISTORY                   |   21 +
 README                    |   27 +-
 client/device.c           |   14 +
 client/device.h           |    2 +
 client/filter.c           |  157 ++--
 client/filter.h           |    3 +-
 client/po/de_DE.po        |   31 +-
 client/po/es_ES.po        |   31 +-
 client/po/fi_FI.po        |   29 +-
 client/po/fr_FR.po        |   31 +-
 client/po/it_IT.po        |   31 +-
 client/po/lt_LT.po        |   31 +-
 client/po/pl_PL.po        |   63 ++
 client/po/ru_RU.po        |   31 +-
 client/po/sk_SK.po        |    6 +-
 client/setup.c            |    5 +
 client/setup.h            |    1 +
 common.c                  |    2 +-
 remux/extern.c            |   81 +-
 remux/extern.h            |    2 +
 server/connection.c       |   74 +-
 server/connection.h       |   37 +-
 server/connectionHTTP.c   |  101 +-
 server/connectionHTTP.h   |    8 +-
 server/connectionIGMP.c   |   28 +-
 server/connectionIGMP.h   |    7 +-
 server/connectionVTP.c    |   65 +-
 server/connectionVTP.h    |    4 +-
 server/livestreamer.c     |  178 +++-
 server/livestreamer.h     |   44 +-
 server/menu.c             |    4 +-
 server/menuHTTP.c         |   19 +-
 server/menuHTTP.h         |    5 +-
 server/po/de_DE.po        |    6 +-
 server/po/es_ES.po        |   16 +-
 server/po/fi_FI.po        |   11 +-
 server/po/fr_FR.po        |   16 +-
 server/po/it_IT.po        |   18 +-
 server/po/lt_LT.po        |   16 +-
 server/po/pl_PL.po        |   96 ++
 server/po/ru_RU.po        |   16 +-
 server/po/sk_SK.po        |    6 +-
 server/recplayer.c        |   13 +-
 server/recplayer.h        |    3 +
 server/recstreamer.c      |   32 +-
 server/recstreamer.h      |    3 +-
 server/setup.c            |    4 +
 server/setup.h            |    1 +
 server/streamdev-server.c |  107 ++-
 server/streamdev-server.h |   17 +
 server/streamer.c         |   30 +-
 server/streamer.h         |   14 +-
 server/suspend.dat        | 2256 +++++++++++++++++++++------------------------
 tools/source.c            |   14 +-
 55 files changed, 2191 insertions(+), 1699 deletions(-)

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