This is an automated email from the git hooks/post-receive script. jcowgill-guest pushed a commit to branch master in repository libcsfml.
commit ad30c1bee4c363b6620622503d0909e33d6ed6a3 Merge: 2ce4735 583bb5c Author: James Cowgill <[email protected]> Date: Tue Mar 3 20:43:00 2015 +0000 Merge tag 'upstream/2.2' Upstream version 2.2 # gpg: Signature made Tue 03 Mar 2015 20:42:55 GMT 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 | 29 ++++--- cmake/Config.cmake | 47 ++++++----- cmake/Macros.cmake | 73 ++++------------- doc/CMakeLists.txt | 2 +- doc/doxyfile.in | 2 +- include/SFML/Audio.h | 2 +- include/SFML/Audio/Export.h | 2 +- include/SFML/Audio/Listener.h | 45 +++++++--- include/SFML/Audio/Music.h | 2 +- include/SFML/Audio/Sound.h | 2 +- include/SFML/Audio/SoundBuffer.h | 2 +- include/SFML/Audio/SoundBufferRecorder.h | 2 +- include/SFML/Audio/SoundRecorder.h | 77 +++++++++++++++++- include/SFML/Audio/SoundStatus.h | 2 +- include/SFML/Audio/SoundStream.h | 2 +- include/SFML/Audio/Types.h | 3 +- include/SFML/Config.h | 21 +++-- include/SFML/Graphics.h | 2 +- include/SFML/Graphics/BlendMode.h | 50 ++++++++++-- include/SFML/Graphics/CircleShape.h | 2 +- include/SFML/Graphics/Color.h | 2 +- include/SFML/Graphics/ConvexShape.h | 2 +- include/SFML/Graphics/Export.h | 2 +- include/SFML/Graphics/Font.h | 50 +++++++++++- .../SFML/{System/Vector3.h => Graphics/FontInfo.h} | 20 ++--- include/SFML/Graphics/Glyph.h | 8 +- include/SFML/Graphics/Image.h | 2 +- include/SFML/Graphics/PrimitiveType.h | 2 +- include/SFML/Graphics/Rect.h | 2 +- include/SFML/Graphics/RectangleShape.h | 2 +- include/SFML/Graphics/RenderStates.h | 2 +- include/SFML/Graphics/RenderTexture.h | 2 +- include/SFML/Graphics/RenderWindow.h | 48 ++++++++++- include/SFML/Graphics/Shader.h | 2 +- include/SFML/Graphics/Shape.h | 2 +- include/SFML/Graphics/Sprite.h | 2 +- include/SFML/Graphics/Text.h | 11 +-- include/SFML/Graphics/Texture.h | 2 +- include/SFML/Graphics/Transform.h | 2 +- include/SFML/Graphics/Transformable.h | 2 +- include/SFML/Graphics/Types.h | 2 +- include/SFML/Graphics/Vertex.h | 2 +- include/SFML/Graphics/VertexArray.h | 2 +- include/SFML/Graphics/View.h | 2 +- include/SFML/Network.h | 2 +- include/SFML/Network/Export.h | 2 +- include/SFML/Network/Ftp.h | 2 +- include/SFML/Network/Http.h | 16 ++-- include/SFML/Network/IpAddress.h | 2 +- include/SFML/Network/Packet.h | 2 +- include/SFML/Network/SocketSelector.h | 2 +- include/SFML/Network/SocketStatus.h | 2 +- include/SFML/Network/TcpListener.h | 2 +- include/SFML/Network/TcpSocket.h | 2 +- include/SFML/Network/Types.h | 2 +- include/SFML/Network/UdpSocket.h | 2 +- include/SFML/OpenGL.h | 2 +- include/SFML/System.h | 2 +- include/SFML/System/Clock.h | 2 +- include/SFML/System/Export.h | 2 +- include/SFML/System/InputStream.h | 2 +- include/SFML/System/Mutex.h | 2 +- include/SFML/System/Sleep.h | 2 +- include/SFML/System/Thread.h | 2 +- include/SFML/System/Time.h | 2 +- include/SFML/System/Types.h | 3 +- include/SFML/System/Vector2.h | 2 +- include/SFML/System/Vector3.h | 2 +- include/SFML/Window.h | 2 +- include/SFML/Window/Context.h | 2 +- include/SFML/Window/Event.h | 95 ++++++++++++++-------- include/SFML/Window/Export.h | 2 +- include/SFML/Window/Joystick.h | 17 +++- .../Vector3.h => Window/JoystickIdentification.h} | 29 ++++--- include/SFML/Window/Keyboard.h | 3 +- include/SFML/Window/Mouse.h | 3 +- include/SFML/Window/{Mouse.h => Sensor.h} | 60 +++++++------- include/SFML/Window/{Context.h => Touch.h} | 34 ++++---- include/SFML/Window/Types.h | 2 +- include/SFML/Window/VideoMode.h | 3 +- include/SFML/Window/Window.h | 33 +++++++- include/SFML/Window/WindowHandle.h | 2 +- license.txt | 2 +- readme.txt | 13 ++- src/SFML/Audio/CMakeLists.txt | 2 +- src/SFML/Audio/Listener.cpp | 18 +++- src/SFML/Audio/Music.cpp | 2 +- src/SFML/Audio/MusicStruct.h | 2 +- src/SFML/Audio/Sound.cpp | 4 +- src/SFML/Audio/SoundBuffer.cpp | 4 +- src/SFML/Audio/SoundBufferRecorder.cpp | 2 +- src/SFML/Audio/SoundBufferRecorderStruct.h | 2 +- src/SFML/Audio/SoundBufferStruct.h | 2 +- src/SFML/Audio/SoundRecorder.cpp | 60 +++++++++++++- src/SFML/Audio/SoundRecorderStruct.h | 10 ++- src/SFML/Audio/SoundStream.cpp | 4 +- src/SFML/Audio/SoundStreamStruct.h | 2 +- src/SFML/Audio/SoundStruct.h | 2 +- src/SFML/CMakeLists.txt | 17 ++-- src/SFML/CallbackStream.h | 2 +- src/SFML/ConvertEvent.h | 17 +++- .../HttpStruct.h => Graphics/BlendMode.cpp} | 38 +++------ src/SFML/Graphics/CMakeLists.txt | 4 +- src/SFML/Graphics/CircleShape.cpp | 2 +- src/SFML/Graphics/CircleShapeStruct.h | 2 +- src/SFML/Graphics/Color.cpp | 2 +- src/SFML/Graphics/ConvertRenderStates.hpp | 9 +- src/SFML/Graphics/ConvertTransform.hpp | 2 +- src/SFML/Graphics/ConvexShape.cpp | 2 +- src/SFML/Graphics/ConvexShapeStruct.h | 2 +- src/SFML/Graphics/Font.cpp | 47 ++++++----- src/SFML/Graphics/FontStruct.h | 2 +- src/SFML/Graphics/Image.cpp | 2 +- src/SFML/Graphics/ImageStruct.h | 2 +- src/SFML/Graphics/Rect.cpp | 2 +- src/SFML/Graphics/RectangleShape.cpp | 2 +- src/SFML/Graphics/RectangleShapeStruct.h | 2 +- src/SFML/Graphics/RenderTexture.cpp | 2 +- src/SFML/Graphics/RenderTextureStruct.h | 2 +- src/SFML/Graphics/RenderWindow.cpp | 31 ++++++- src/SFML/Graphics/RenderWindowStruct.h | 2 +- src/SFML/Graphics/Shader.cpp | 2 +- src/SFML/Graphics/ShaderStruct.h | 2 +- src/SFML/Graphics/Shape.cpp | 2 +- src/SFML/Graphics/ShapeStruct.h | 2 +- src/SFML/Graphics/Sprite.cpp | 2 +- src/SFML/Graphics/SpriteStruct.h | 2 +- src/SFML/Graphics/Text.cpp | 2 +- src/SFML/Graphics/TextStruct.h | 2 +- src/SFML/Graphics/Texture.cpp | 2 +- src/SFML/Graphics/TextureStruct.h | 2 +- src/SFML/Graphics/Transform.cpp | 2 +- src/SFML/Graphics/Transformable.cpp | 2 +- src/SFML/Graphics/TransformableStruct.h | 2 +- src/SFML/Graphics/VertexArray.cpp | 2 +- src/SFML/Graphics/VertexArrayStruct.h | 2 +- src/SFML/Graphics/View.cpp | 2 +- src/SFML/Graphics/ViewStruct.h | 2 +- src/SFML/Internal.h | 2 +- src/SFML/Main/SFML_Main.cpp | 2 +- src/SFML/Network/CMakeLists.txt | 2 +- src/SFML/Network/Ftp.cpp | 2 +- src/SFML/Network/FtpStruct.h | 2 +- src/SFML/Network/Http.cpp | 2 +- src/SFML/Network/HttpStruct.h | 2 +- src/SFML/Network/IpAddress.cpp | 2 +- src/SFML/Network/Packet.cpp | 2 +- src/SFML/Network/PacketStruct.h | 2 +- src/SFML/Network/SocketSelector.cpp | 2 +- src/SFML/Network/SocketSelectorStruct.h | 2 +- src/SFML/Network/TcpListener.cpp | 2 +- src/SFML/Network/TcpListenerStruct.h | 2 +- src/SFML/Network/TcpSocket.cpp | 2 +- src/SFML/Network/TcpSocketStruct.h | 2 +- src/SFML/Network/UdpSocket.cpp | 2 +- src/SFML/Network/UdpSocketStruct.h | 2 +- src/SFML/System/CMakeLists.txt | 2 +- src/SFML/System/Clock.cpp | 2 +- src/SFML/System/ClockStruct.h | 2 +- src/SFML/System/Mutex.cpp | 2 +- src/SFML/System/MutexStruct.h | 2 +- src/SFML/System/Sleep.cpp | 2 +- src/SFML/System/Thread.cpp | 2 +- src/SFML/System/ThreadStruct.h | 2 +- src/SFML/System/Time.cpp | 2 +- src/SFML/Window/CMakeLists.txt | 7 +- src/SFML/Window/Context.cpp | 2 +- src/SFML/Window/ContextStruct.h | 2 +- src/SFML/Window/Joystick.cpp | 18 +++- src/SFML/Window/Keyboard.cpp | 2 +- src/SFML/Window/Mouse.cpp | 2 +- src/SFML/Window/{Context.cpp => Sensor.cpp} | 23 +++--- src/SFML/{System/Mutex.cpp => Window/Touch.cpp} | 33 ++++---- src/SFML/Window/VideoMode.cpp | 2 +- src/SFML/Window/Window.cpp | 16 +++- src/SFML/Window/WindowStruct.h | 2 +- 176 files changed, 924 insertions(+), 493 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
