[Pkg-mpd-commits] [pkg-mpd] 02/03: Merge tag 'upstream/0.18.13'

[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 089202bdcba80b3f48744ed566be794fb69b6f2e
Merge: 8434680 4e13c5e
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Sep 1 21:43:34 2014 +0200

    Merge tag 'upstream/0.18.13'
    
    Upstream version 0.18.13

 Makefile.am                           |  12 ++---
 Makefile.in                           |  89 ++++++++++++++++++----------------
 NEWS                                  |  12 +++++
 configure                             |  24 ++++-----
 configure.ac                          |   4 +-
 doc/doxygen.conf                      |   2 +-
 doc/protocol.xml                      |   7 ++-
 src/Playlist.hxx                      |   4 ++
 src/PlaylistControl.cxx               |  24 ++++++---
 src/decoder/DsdiffDecoderPlugin.cxx   |   2 +-
 src/decoder/DsfDecoderPlugin.cxx      |   2 +-
 src/decoder/FfmpegDecoderPlugin.cxx   |   9 ++++
 src/decoder/GmeDecoderPlugin.cxx      |   2 +-
 src/event/BufferedSocket.cxx          |   2 +-
 src/event/TimeoutMonitor.cxx          |   4 +-
 src/output/AlsaOutputPlugin.cxx       |  11 +++++
 src/output/OssOutputPlugin.cxx        |   4 ++
 src/system/ByteOrder.hxx              |  10 ++++
 src/util/ASCII.hxx                    |   2 +-
 src/{ => win32}/Win32Main.cxx         |   0
 src/{win => win32}/mpd.ico            | Bin
 src/{win => win32}/mpd_win32_rc.rc.in |   2 +-
 22 files changed, 148 insertions(+), 80 deletions(-)

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