This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch master in repository libcsfml.
commit c37c97a629d0252c6480416e2336508aac478f81 Merge: 78b40f4 8f309d7 Author: James Cowgill <[email protected]> Date: Thu May 21 23:02:44 2015 +0100 Merge tag 'upstream/2.3' Upstream version 2.3 # gpg: Signature made Thu 21 May 2015 23:02:43 BST using RSA key ID EA2D01EF # gpg: Good signature from "James Cowgill <[email protected]>" # gpg: aka "James Cowgill <[email protected]>" # gpg: aka "James Cowgill (Imagination Technologies) <[email protected]>" CMakeLists.txt | 4 ++-- cmake/Macros.cmake | 8 ++++++++ include/SFML/Audio.h | 2 ++ include/SFML/Audio/SoundBuffer.h | 4 ++-- include/SFML/Config.h | 2 +- include/SFML/Graphics.h | 3 ++- include/SFML/Graphics/CircleShape.h | 7 ++++--- include/SFML/Graphics/Color.h | 29 +++++++++++++++++++++++++++++ include/SFML/Graphics/ConvexShape.h | 9 +++++---- include/SFML/Graphics/RectangleShape.h | 5 +++-- include/SFML/Graphics/RenderTexture.h | 3 ++- include/SFML/Graphics/RenderWindow.h | 3 ++- include/SFML/Graphics/Shader.h | 14 ++++++++++++++ include/SFML/Graphics/Shape.h | 9 +++++---- include/SFML/Graphics/Texture.h | 14 ++++++++++++++ include/SFML/Graphics/VertexArray.h | 7 ++++--- include/SFML/Network.h | 1 + include/SFML/Network/SocketStatus.h | 1 + include/SFML/Network/TcpSocket.h | 22 ++++++++++++++++++++++ include/SFML/System.h | 1 + include/SFML/Window.h | 3 +++ include/SFML/Window/Event.h | 21 ++++++++++++++++++--- include/SFML/Window/Mouse.h | 10 ++++++++++ include/SFML/Window/Window.h | 13 +++++++++++++ readme.txt | 13 +++++++------ src/SFML/Audio/SoundBuffer.cpp | 4 ++-- src/SFML/ConvertEvent.h | 9 ++++++++- src/SFML/Graphics/CircleShape.cpp | 6 +++--- src/SFML/Graphics/Color.cpp | 34 ++++++++++++++++++++++++++++++++++ src/SFML/Graphics/ConvexShape.cpp | 8 ++++---- src/SFML/Graphics/RectangleShape.cpp | 4 ++-- src/SFML/Graphics/RenderTexture.cpp | 4 ++-- src/SFML/Graphics/RenderWindow.cpp | 6 +++++- src/SFML/Graphics/Shader.cpp | 7 +++++++ src/SFML/Graphics/Shape.cpp | 4 ++-- src/SFML/Graphics/ShapeStruct.h | 4 ++-- src/SFML/Graphics/Texture.cpp | 7 +++++++ src/SFML/Graphics/VertexArray.cpp | 6 +++--- src/SFML/Network/TcpSocket.cpp | 9 +++++++++ src/SFML/Window/Window.cpp | 6 +++++- 40 files changed, 270 insertions(+), 56 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libcsfml.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
