[vdr-plugin-live] 02/05: Merge tag 'upstream/0.3.0+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-live.

commit f3b1213fe498033839d7273863bcf09ad469f867
Merge: 88b3a62 7853a60
Author: etobi <git at e-tobi.net>
Date:   Fri Feb 13 19:01:48 2015 +0100

    Merge tag 'upstream/0.3.0+git20150213'
    
    Upstream version 0.3.0+git20150213
    
    Conflicts:
    	debian/links
    	debian/rules

 Makefile               | 162 ++++------
 README                 |  58 ++--
 css/Makefile           |  34 +-
 httpd/Makefile         |  46 ---
 httpd/dispatcher.cpp   | 109 -------
 httpd/job.cpp          | 240 --------------
 httpd/listener.cpp     | 167 ----------
 httpd/poller.cpp       | 190 -----------
 httpd/regex.cpp        | 175 -----------
 httpd/tnt/dispatcher.h | 121 -------
 httpd/tnt/gcryptinit.h |  37 ---
 httpd/tnt/gnutls.h     | 146 ---------
 httpd/tnt/job.h        | 201 ------------
 httpd/tnt/listener.h   |  78 -----
 httpd/tnt/openssl.h    | 121 -------
 httpd/tnt/poller.h     |  61 ----
 httpd/tnt/regex.h      |  79 -----
 httpd/tnt/ssl.h        |  52 ----
 httpd/tnt/tntnet.h     |  99 ------
 httpd/tnt/worker.h     |  91 ------
 httpd/tntnet.cpp       | 832 -------------------------------------------------
 httpd/worker.cpp       | 364 ----------------------
 javascript/Makefile    |  34 +-
 pages/Makefile         |  37 +--
 pages/page_exit.eh     |   4 -
 pages/recordings.ecpp  |   8 +-
 pages/vlc.ecpp         |   4 -
 po/ca_ES.po            |   2 +-
 po/cs_CZ.po            |   2 +-
 po/da_DK.po            |   2 +-
 po/de_DE.po            |   2 +-
 po/el_GR.po            |   2 +-
 po/es_ES.po            |   2 +-
 po/et_EE.po            |   2 +-
 po/fi_FI.po            |   2 +-
 po/fr_FR.po            |   2 +-
 po/hr_HR.po            |   2 +-
 po/hu_HU.po            |   2 +-
 po/it_IT.po            |   2 +-
 po/lt_LT.po            |   2 +-
 po/nl_NL.po            |   2 +-
 po/nn_NO.po            |   2 +-
 po/pl_PL.po            |   2 +-
 po/pt_PT.po            |   2 +-
 po/ro_RO.po            |   2 +-
 po/ru_RU.po            | 611 ++++++++++++++++++------------------
 po/sk_SK.po            |   2 +-
 po/sl_SI.po            |   2 +-
 po/sv_SE.po            |   2 +-
 po/tr_TR.po            |   2 +-
 recman.cpp             |   4 +
 setup.cpp              |  14 +-
 setup.h                |   6 -
 thread.cpp             |  22 --
 tntconfig.cpp          | 162 ----------
 tntconfig.h            |  26 --
 tntfeatures.h          |  13 -
 tools.cpp              |  12 +
 tools.h                |  32 +-
 59 files changed, 457 insertions(+), 4039 deletions(-)

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