[Pkg-sdl-commits] [libsdl2-mixer] 03/11: Merge tag 'upstream/2.0.1+dfsg1'

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to branch master
in repository libsdl2-mixer.

commit 5782ba643ec40835a2b3b520724ba04235343df6
Merge: 06e656e b1f9647
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Tue Jan 26 16:07:28 2016 +0000

    Merge tag 'upstream/2.0.1+dfsg1'
    
    Upstream version 2.0.1+dfsg1
    
    # gpg: Signature made Tue 26 Jan 2016 16:07:23 GMT using RSA key ID 45DCA80E
    # gpg: Good signature from "Manuel A. Fernandez Montecelo (GMail) <manuel.montezelo at gmail.com>"
    # gpg:                 aka "Manuel A. Fernandez Montecelo (EMBL-EBI) <mafm at ebi.ac.uk>"
    # gpg:                 aka "Manuel A. Fernandez Montecelo <mafm at debian.org>"

 Android.mk                       |  36 ++-
 CHANGES.txt                      |  10 +
 COPYING.txt                      |   2 +-
 Makefile.in                      |   2 +-
 SDL2_mixer.spec                  |   4 +-
 SDL_mixer.h                      |   8 +-
 build-scripts/config.guess       | 301 +++++++++++++----------
 build-scripts/config.sub         | 251 +++++++++++++------
 configure                        |  39 +--
 configure.in                     |  27 +-
 dynamic_flac.c                   |   2 +-
 dynamic_flac.h                   |   2 +-
 dynamic_fluidsynth.c             |   2 +-
 dynamic_fluidsynth.h             |   2 +-
 dynamic_mod.c                    |   2 +-
 dynamic_mod.h                    |   2 +-
 dynamic_modplug.c                |   2 +-
 dynamic_modplug.h                |   8 +-
 dynamic_mp3.c                    |   2 +-
 dynamic_mp3.h                    |   2 +-
 dynamic_ogg.c                    |   2 +-
 dynamic_ogg.h                    |   8 +-
 effect_position.c                |   2 +-
 effect_stereoreverse.c           |   2 +-
 effects_internal.c               |   2 +-
 effects_internal.h               |   2 +-
 fluidsynth.c                     |   3 +-
 fluidsynth.h                     |   2 +-
 load_aiff.c                      |   2 +-
 load_aiff.h                      |   2 +-
 load_flac.c                      |   2 +-
 load_flac.h                      |   2 +-
 load_mp3.c                       | 195 +++++++++++++++
 load_flac.h => load_mp3.h        |  11 +-
 load_ogg.c                       |  17 +-
 load_ogg.h                       |   2 +-
 load_voc.c                       |   2 +-
 load_voc.h                       |   2 +-
 mixer.c                          |  49 +++-
 music.c                          |   4 +-
 music_cmd.c                      |   2 +-
 music_cmd.h                      |   2 +-
 music_flac.c                     |   2 +-
 music_flac.h                     |   2 +-
 music_mad.c                      |   2 +-
 music_mad.h                      |   2 +-
 music_mod.c                      |   2 +-
 music_mod.h                      |   2 +-
 music_modplug.c                  |   2 +-
 music_modplug.h                  |   8 +-
 music_ogg.c                      |  10 +-
 music_ogg.h                      |   8 +-
 native_midi/native_midi_common.c |   3 +-
 playmus.c                        |   2 +-
 playwave.c                       |   2 +-
 timidity/playmidi.c              |   2 +-
 timidity/readmidi.c              |   6 +-
 timidity/timidity.c              |  18 +-
 version.rc                       |  10 +-
 wavestream.c                     | 515 ++++++++++++++++++++++++---------------
 wavestream.h                     |  19 +-
 61 files changed, 1111 insertions(+), 529 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2-mixer.git