[libsfml] 02/03: Merge tag 'upstream/2.3.1+dfsg'

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository libsfml.

commit 0359b3872b8692245372ac16113c2d5b01ae1f73
Merge: db28176 232f6c9
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Jul 4 22:12:39 2015 +0100

    Merge tag 'upstream/2.3.1+dfsg'
    
    Upstream version 2.3.1+dfsg
    
    # gpg: Signature made Sat 04 Jul 2015 22:12:34 BST using RSA key ID EA2D01EF
    # gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>"
    # gpg:                 aka "James Cowgill <jc1311 at york.ac.uk>"
    # gpg:                 aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>"

 CMakeLists.txt                                |   2 +-
 changelog.txt                                 |  36 +++++
 include/SFML/Audio/Music.hpp                  |  24 ++-
 include/SFML/Audio/SoundRecorder.hpp          |   4 +-
 include/SFML/Config.hpp                       |   2 +-
 include/SFML/Graphics/Font.hpp                |  16 +-
 include/SFML/Graphics/RenderStates.hpp        |   2 +-
 include/SFML/Graphics/Shader.hpp              |   2 +-
 include/SFML/Graphics/Texture.hpp             |   2 +-
 include/SFML/System/FileInputStream.hpp       |   2 +-
 include/SFML/Window/Joystick.hpp              |   2 +-
 src/SFML/Audio/InputSoundFile.cpp             |   9 --
 src/SFML/Audio/OutputSoundFile.cpp            |   4 -
 src/SFML/Audio/SoundFileFactory.cpp           |   9 +-
 src/SFML/Audio/SoundRecorder.cpp              |   4 +-
 src/SFML/Graphics/GLExtensions.hpp            |   4 +
 src/SFML/Graphics/GLExtensions.txt            |   1 +
 src/SFML/Graphics/GLLoader.cpp                |   7 +-
 src/SFML/Graphics/GLLoader.hpp                |   3 +
 src/SFML/Graphics/Shader.cpp                  |   4 +-
 src/SFML/Graphics/Shape.cpp                   |   2 +-
 src/SFML/Graphics/Texture.cpp                 |  16 +-
 src/SFML/Main/MainAndroid.cpp                 |  71 +++++++--
 src/SFML/Network/TcpSocket.cpp                |   2 +-
 src/SFML/System/Android/ResourceStream.cpp    |   2 +-
 src/SFML/System/FileInputStream.cpp           |   7 +-
 src/SFML/Window/Android/InputImpl.cpp         |  10 ++
 src/SFML/Window/Android/WindowImplAndroid.cpp |  73 +++++----
 src/SFML/Window/Android/WindowImplAndroid.hpp |   8 +-
 src/SFML/Window/Unix/Display.cpp              | 146 ++++++++---------
 src/SFML/Window/Unix/Display.hpp              |   8 +-
 src/SFML/Window/Unix/InputImpl.cpp            | 216 +++++++++++++-------------
 src/SFML/Window/Unix/InputImpl.hpp            |   6 +
 src/SFML/Window/Unix/WindowImplX11.cpp        | 112 ++++++++++---
 34 files changed, 518 insertions(+), 300 deletions(-)

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