[libsfml] 02/06: Merge tag 'upstream/2.4.1+dfsg'
James Cowgill
jcowgill at moszumanska.debian.org
Thu Nov 3 21:30:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill pushed a commit to branch master
in repository libsfml.
commit 04f247bf9eeda2ed1eb519b168ac8085fb96a240
Merge: 9f0037a 729f4aa
Author: James Cowgill <jcowgill at debian.org>
Date: Thu Nov 3 21:12:47 2016 +0000
Merge tag 'upstream/2.4.1+dfsg'
Upstream version 2.4.1+dfsg
# gpg: Signature made Thu 03 Nov 2016 21:12:39 GMT
# 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 | 2 +-
changelog.txt | 51 ++++++++++++++++++++++++++++++++++++--
include/SFML/Config.hpp | 2 +-
include/SFML/Window/GlResource.hpp | 6 +++++
src/SFML/Window/GlContext.cpp | 6 -----
src/SFML/Window/GlContext.hpp | 6 -----
src/SFML/Window/GlResource.cpp | 7 ++++++
7 files changed, 64 insertions(+), 16 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