[vdr-plugin-streamdev] 03/04: Merge tag 'upstream/0.6.1'

[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 899a8786937370dbd01a7f4c147449907c2ec65f
Merge: a47445e 6b03675
Author: etobi <git at e-tobi.net>
Date:   Tue Nov 4 22:07:21 2014 +0100

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1
    
    Conflicts:
    	CONTRIBUTORS
    	HISTORY
    	client/device.c
    	client/po/fi_FI.po
    	client/po/sk_SK.po
    	common.c
    	server/connectionHTTP.c
    	server/connectionHTTP.h
    	server/menuHTTP.c
    	server/menuHTTP.h
    	server/recstreamer.c
    	server/recstreamer.h

 CONTRIBUTORS                                       |  11 ++
 HISTORY                                            |  26 ++++
 README                                             |  31 +++--
 client/device.c                                    |  42 +++---
 client/po/fi_FI.po                                 |   4 +-
 client/po/sk_SK.po                                 |  43 ++++---
 client/socket.c                                    |  12 +-
 common.c                                           |   2 +-
 patches/vdr-1.4.x-localchannelprovide.diff         | 102 ---------------
 ...ff => vdr-1.6.0-1.7.29-ignore_missing_cam.diff} |   0
 ....patch => vdr-1.6.0-1.7.29-intcamdevices.patch} |   0
 remux/ts2ps.c                                      |   3 +
 remux/ts2ps.h                                      |   4 +
 server/connection.c                                |  27 +++-
 server/connection.h                                |   8 +-
 server/connectionHTTP.c                            | 141 +++++++++++++++++----
 server/connectionHTTP.h                            |   6 +-
 server/connectionIGMP.c                            |   5 +-
 server/connectionVTP.c                             |  15 ++-
 server/livestreamer.c                              |   2 +
 server/menuHTTP.c                                  |   6 +-
 server/menuHTTP.h                                  |   1 +
 server/po/de_DE.po                                 |  16 ++-
 server/po/fi_FI.po                                 |   5 +-
 server/po/sk_SK.po                                 |  52 ++++----
 server/recplayer.c                                 |  43 ++++++-
 server/recplayer.h                                 |   6 +-
 server/recstreamer.c                               |  11 +-
 server/recstreamer.h                               |   7 +-
 server/setup.c                                     |  11 ++
 server/setup.h                                     |   8 ++
 server/streamdev-server.c                          |  10 ++
 server/streamdev-server.h                          |   1 +
 server/suspend.c                                   |   2 +-
 34 files changed, 402 insertions(+), 261 deletions(-)

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