[Pkg-mpd-commits] [pkg-mpd] 02/10: Merge tag 'upstream/0.18.6'

[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 56a40b63d7edfd6d3edf3fe5793462d4680f7973
Merge: 71685fe aa7bfec
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Dec 29 00:07:43 2013 +0100

    Merge tag 'upstream/0.18.6'
    
    Upstream version 0.18.6

 Makefile.in                           | 1274 ++++++++++++++++-----------------
 NEWS                                  |   15 +
 aclocal.m4                            |  653 ++++++++++-------
 compile                               |  347 +++++++++
 config.h.in                           |    3 +
 configure                             |  347 ++++++---
 configure.ac                          |    3 +-
 doc/doxygen.conf                      |    2 +-
 doc/mpd.conf.5                        |  131 ----
 doc/user.xml                          |   97 +++
 src/OutputControl.cxx                 |    2 +
 src/PlayerThread.cxx                  |    5 +-
 src/SongUpdate.cxx                    |    3 +-
 src/TagFile.hxx                       |    3 +
 src/decoder/FfmpegDecoderPlugin.cxx   |   17 +-
 src/input/CdioParanoiaInputPlugin.cxx |    5 +
 src/mixer/AlsaMixerPlugin.cxx         |   13 +
 src/output/OSXOutputPlugin.cxx        |    6 +-
 src/output/OpenALOutputPlugin.cxx     |    2 +-
 src/tag/Riff.cxx                      |    3 +-
 src/util/Error.hxx                    |    1 +
 test-driver                           |  127 ++++
 22 files changed, 1917 insertions(+), 1142 deletions(-)

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