[libsfml] 02/11: Merge tag 'upstream/2.4.1_git15.b61c2f8+dfsg'

[James Cowgill]

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

jcowgill pushed a commit to branch master
in repository libsfml.

commit ceae653da000efb24f83e509fff14527ef725d7a
Merge: 8d99e68 fc50d23
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Oct 27 18:34:33 2016 +0100

    Merge tag 'upstream/2.4.1_git15.b61c2f8+dfsg'
    
    Upstream version 2.4.1~git15.b61c2f8+dfsg
    
    # gpg: Signature made Thu 27 Oct 2016 18:34:26 BST
    # gpg:                using RSA key C7F1676DEA2D01EF
    # gpg:                issuer "jcowgill at debian.org"
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>" [ultimate]
    # gpg:                 aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>" [ultimate]
    # gpg:                 aka "James Cowgill <jcowgill at debian.org>" [ultimate]

 CMakeLists.txt                                |    5 +
 cmake/Config.cmake                            |    6 +-
 cmake/Modules/FindSFML.cmake                  |    9 +-
 cmake/Modules/FindXCB.cmake                   |   97 --
 examples/X11/X11.cpp                          |  125 +-
 include/SFML/Graphics/Rect.hpp                |    6 +
 include/SFML/Network/UdpSocket.hpp            |    8 +-
 include/SFML/Window/GlResource.hpp            |   25 +-
 include/SFML/Window/Window.hpp                |    4 +-
 src/SFML/Graphics/Font.cpp                    |    4 -
 src/SFML/Graphics/GLExtensions.cpp            |   43 +-
 src/SFML/Graphics/RenderTextureImplFBO.cpp    |    4 +-
 src/SFML/Graphics/Shader.cpp                  |  113 +-
 src/SFML/Graphics/Texture.cpp                 |   79 +-
 src/SFML/Window/CMakeLists.txt                |   16 +-
 src/SFML/Window/Context.cpp                   |   80 +-
 src/SFML/Window/EglContext.cpp                |   10 +-
 src/SFML/Window/EglContext.hpp                |    4 +-
 src/SFML/Window/GlContext.cpp                 |  210 +++-
 src/SFML/Window/GlContext.hpp                 |   28 +-
 src/SFML/Window/GlResource.cpp                |   46 +-
 src/SFML/Window/OSX/SFContext.hpp             |    4 +-
 src/SFML/Window/OSX/SFContext.mm              |   29 +-
 src/SFML/Window/OSX/SFOpenGLView+mouse.mm     |    2 +-
 src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h |    3 +-
 src/SFML/Window/Unix/Display.cpp              |   89 +-
 src/SFML/Window/Unix/Display.hpp              |   56 +-
 src/SFML/Window/Unix/GlxContext.cpp           |   81 +-
 src/SFML/Window/Unix/GlxContext.hpp           |    7 +-
 src/SFML/Window/Unix/InputImpl.cpp            |  188 +--
 src/SFML/Window/Unix/ScopedXcbPtr.hpp         |  102 --
 src/SFML/Window/Unix/ScopedXcbPtr.inl         |   72 --
 src/SFML/Window/Unix/VideoModeImpl.cpp        |  274 ++---
 src/SFML/Window/Unix/WindowImplX11.cpp        | 1512 ++++++++++---------------
 src/SFML/Window/Unix/WindowImplX11.hpp        |   96 +-
 src/SFML/Window/Win32/WglContext.cpp          |   22 +-
 src/SFML/Window/Win32/WglContext.hpp          |    4 +-
 src/SFML/Window/iOS/EaglContext.hpp           |    4 +-
 src/SFML/Window/iOS/EaglContext.mm            |   21 +-
 src/SFML/Window/iOS/SFAppDelegate.mm          |    4 +-
 40 files changed, 1382 insertions(+), 2110 deletions(-)

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