[pygame-sdl2] 02/04: Merge tag 'upstream/6.99.12'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository pygame-sdl2.

commit 2e1c2022ec1a22d7656147ae196ce8a6aeae835c
Merge: 87665b2 4a76516
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 21 11:57:13 2016 +0100

    Merge tag 'upstream/6.99.12'
    
    Upstream version 6.99.12
    
    # gpg: Signatur vom Mi 21 Dez 2016 11:57:11 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 PKG-INFO                      |    2 +-
 gen/pygame_sdl2.display.c     | 3354 ++++++++++++-----------
 gen/pygame_sdl2.mixer.c       | 5834 ++++++++++++++++-------------------------
 gen/pygame_sdl2.rwobject.c    |  534 ++--
 gen3/pygame_sdl2.display.c    | 3382 +++++++++++++-----------
 gen3/pygame_sdl2.rwobject.c   | 1293 +++++----
 pygame_sdl2.egg-info/PKG-INFO |    2 +-
 setup.cfg                     |    2 +-
 setup.py                      |   14 +-
 src/SDL_gfxPrimitives.c       |    2 +-
 src/pygame_sdl2/display.pyx   |   31 +-
 src/pygame_sdl2/mixer.pyx     |   72 +-
 src/pygame_sdl2/rwobject.pyx  |   18 +-
 13 files changed, 6942 insertions(+), 7598 deletions(-)

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