[Pkg-mpd-commits] [pkg-mpd] 02/07: Merge tag 'upstream/0.18.14'

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 93d37fb7ec97dcb6d15c25fff6ef14e3d1018cf4
Merge: 33c2c13 db3f340
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Sep 11 21:15:50 2014 +0200

    Merge tag 'upstream/0.18.14'
    
    Upstream version 0.18.14

 Makefile.am                            | 11 +++++
 Makefile.in                            | 79 +++++++++++++++++++++++++++++++---
 NEWS                                   |  8 ++++
 configure                              | 20 ++++-----
 configure.ac                           |  2 +-
 doc/doxygen.conf                       |  2 +-
 src/DecoderAPI.cxx                     |  4 ++
 src/DecoderInternal.cxx                |  3 ++
 src/DecoderThread.cxx                  | 12 +++++-
 src/decoder/AudiofileDecoderPlugin.cxx |  2 +-
 src/decoder/FfmpegDecoderPlugin.cxx    | 13 ++++++
 src/protocol/ArgParser.cxx             |  4 +-
 test/run_decoder.cxx                   |  4 +-
 test/test_protocol.cxx                 | 60 ++++++++++++++++++++++++++
 14 files changed, 202 insertions(+), 22 deletions(-)

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