This is an automated email from the git hooks/post-receive script. jcowgill pushed a commit to branch master in repository libcsfml.
commit ca562f64a2765ba0cba21b0e69589f55e9085507 Merge: ee0aa38 8346a2d Author: James Cowgill <[email protected]> Date: Fri Mar 3 22:30:19 2017 +0000 Merge tag 'upstream/2.4' Upstream version 2.4 # gpg: Signature made Fri 03 Mar 2017 22:30:13 GMT # gpg: using RSA key F88C6DE43699E8F3B3B54C10C7F1676DEA2D01EF # gpg: issuer "[email protected]" # gpg: Good signature from "James Cowgill <[email protected]>" [ultimate] # gpg: aka "James Cowgill (Imagination Technologies) <[email protected]>" [ultimate] # gpg: aka "James Cowgill <[email protected]>" [ultimate] CMakeLists.txt | 2 +- doc/CMakeLists.txt | 2 +- doc/doxyfile.in | 6 +- include/SFML/Audio/SoundBufferRecorder.h | 30 +- include/SFML/Audio/SoundRecorder.h | 32 +- include/SFML/Config.h | 38 ++- include/SFML/Graphics/BlendMode.h | 5 +- include/SFML/Graphics/CircleShape.h | 2 +- include/SFML/Graphics/ConvexShape.h | 2 +- include/SFML/Graphics/Font.h | 11 +- .../Context.cpp => include/SFML/Graphics/Glsl.h | 79 ++++- include/SFML/Graphics/PrimitiveType.h | 18 +- include/SFML/Graphics/RectangleShape.h | 2 +- include/SFML/Graphics/RenderTexture.h | 17 + include/SFML/Graphics/RenderWindow.h | 84 +++-- include/SFML/Graphics/Shader.h | 364 +++++++++++++++++++-- include/SFML/Graphics/Shape.h | 2 +- include/SFML/Graphics/Text.h | 87 ++++- include/SFML/Graphics/Texture.h | 60 ++++ include/SFML/Graphics/Transform.h | 2 +- include/SFML/Network/Ftp.h | 26 +- include/SFML/Network/IpAddress.h | 9 +- include/SFML/Network/TcpListener.h | 6 +- include/SFML/Network/TcpSocket.h | 4 +- include/SFML/Network/UdpSocket.h | 17 +- include/SFML/Window/Context.h | 17 +- include/SFML/Window/Event.h | 33 +- include/SFML/Window/Keyboard.h | 13 + include/SFML/Window/VideoMode.h | 2 +- include/SFML/Window/Window.h | 82 +++-- readme.txt | 4 +- src/SFML/Audio/SoundBufferRecorder.cpp | 20 +- src/SFML/Audio/SoundBufferRecorderStruct.h | 1 + src/SFML/Audio/SoundRecorder.cpp | 17 + src/SFML/Graphics/Font.cpp | 4 +- src/SFML/Graphics/RenderTexture.cpp | 7 + src/SFML/Graphics/RenderWindow.cpp | 42 +-- src/SFML/Graphics/Shader.cpp | 318 +++++++++++++++--- src/SFML/Graphics/Text.cpp | 55 +++- src/SFML/Graphics/Texture.cpp | 21 ++ src/SFML/Network/Ftp.cpp | 23 +- src/SFML/Network/IpAddress.cpp | 4 + src/SFML/Network/TcpListener.cpp | 5 +- src/SFML/Network/TcpSocket.cpp | 16 +- src/SFML/Network/UdpSocket.cpp | 57 ++-- src/SFML/Window/CMakeLists.txt | 1 + src/SFML/Window/Context.cpp | 17 +- src/SFML/Window/ContextSettingsInternal.h | 75 +++++ src/SFML/Window/Keyboard.cpp | 6 + src/SFML/Window/Window.cpp | 38 +-- 50 files changed, 1456 insertions(+), 329 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
