[libsfml] 02/03: Merge tag 'upstream/2.3.2+dfsg'
James Cowgill
jcowgill-guest at moszumanska.debian.org
Sun Sep 13 20:49:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to branch master
in repository libsfml.
commit 921ad626b5cd364b1b1e5bf45f68f09a55fd6e29
Merge: a4e819b 301fd78
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Sat Sep 12 23:55:16 2015 +0100
Merge tag 'upstream/2.3.2+dfsg'
Upstream version 2.3.2+dfsg
# gpg: Signature made Sat 12 Sep 2015 23:55:03 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 +-
CONTRIBUTING | 16 +
changelog.txt | 35 ++
cmake/Modules/FindSFML.cmake | 6 +-
include/SFML/Config.hpp | 2 +-
include/SFML/Graphics/Font.hpp | 2 +-
include/SFML/Graphics/Texture.hpp | 1 +
src/SFML/Audio/ALCheck.cpp | 23 +-
src/SFML/Audio/ALCheck.hpp | 12 +-
src/SFML/Graphics/GLCheck.cpp | 28 +-
src/SFML/Graphics/GLCheck.hpp | 11 +-
src/SFML/Graphics/ImageLoader.cpp | 55 ++-
src/SFML/Graphics/RenderTarget.cpp | 15 +-
src/SFML/Graphics/RenderTexture.cpp | 3 +
src/SFML/Graphics/RenderTextureImplFBO.cpp | 3 +-
src/SFML/Graphics/Shader.cpp | 24 +-
src/SFML/Graphics/Texture.cpp | 4 +
src/SFML/Window/Unix/Display.cpp | 187 --------
src/SFML/Window/Unix/Display.hpp | 17 -
src/SFML/Window/Unix/InputImpl.cpp | 253 +++++-----
src/SFML/Window/Unix/InputImpl.hpp | 6 -
src/SFML/Window/Unix/WindowImplX11.cpp | 716 ++++++-----------------------
src/SFML/Window/Unix/WindowImplX11.hpp | 14 +-
23 files changed, 420 insertions(+), 1015 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libsfml.git
More information about the Pkg-games-commits
mailing list