[pygame-sdl2] 02/05: Merge tag 'upstream/6.99.12.4'

[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 db63bcb11e9b972281279b60c2c310c3e5cf07fa
Merge: 6cc90ab ab11d24
Author: Markus Koschany <apo at debian.org>
Date:   Mon Jun 19 01:38:46 2017 +0200

    Merge tag 'upstream/6.99.12.4'
    
    Upstream version 6.99.12.4
    
    # gpg: Signatur vom Mo 19 Jun 2017 01:38:45 CEST
    # 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.color.c       | 6732 +++++++++++++++++++++-------------------
 gen/pygame_sdl2.display.c     | 4171 +++++++++++++------------
 gen/pygame_sdl2.gfxdraw.c     | 1555 +++++-----
 gen/pygame_sdl2.rect.c        | 2359 +++++++-------
 gen3/pygame_sdl2.color.c      | 6746 ++++++++++++++++++++++-------------------
 gen3/pygame_sdl2.display.c    | 4145 ++++++++++++++-----------
 gen3/pygame_sdl2.gfxdraw.c    | 1569 +++++-----
 gen3/pygame_sdl2.mixer.c      | 4408 +++++++++++----------------
 gen3/pygame_sdl2.rect.c       | 2373 ++++++++-------
 pygame_sdl2.egg-info/PKG-INFO |    2 +-
 setup.cfg                     |    2 +-
 src/pygame_sdl2/color.pyx     |   31 +-
 src/pygame_sdl2/display.pyx   |   49 +-
 src/pygame_sdl2/gfxdraw.pyx   |   14 +-
 src/pygame_sdl2/rect.pyx      |    3 +
 16 files changed, 17636 insertions(+), 16525 deletions(-)

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