Laurent Gomila eeff685255 Merge branch 'master' into drawables ... Conflicts: include/SFML/Graphics/Sprite.hpp include/SFML/Graphics/Text.hpp src/SFML/Graphics/Sprite.cpp		2011-12-02 20:58:14 +01:00
..
ftp	Fix CMake variables to allow adding SFML as a dependency.	2011-08-07 14:33:42 +01:00
opengl	Merge branch 'master' into drawables	2011-12-02 20:58:14 +01:00
pong	Implemented the new graphics API:	2011-12-01 23:24:58 +01:00
shader	Implemented the new graphics API:	2011-12-01 23:24:58 +01:00
sockets	Fix CMake variables to allow adding SFML as a dependency.	2011-08-07 14:33:42 +01:00
sound	Implemented the new graphics API:	2011-12-01 23:24:58 +01:00
sound_capture	Implemented the new graphics API:	2011-12-01 23:24:58 +01:00
voip	Fix CMake variables to allow adding SFML as a dependency.	2011-08-07 14:33:42 +01:00
win32	Implemented the new graphics API:	2011-12-01 23:24:58 +01:00
window	Added explicit include directories for OpenGL and X11 in CMake files	2011-09-30 13:43:52 +02:00
X11	Added explicit include directories for OpenGL and X11 in CMake files	2011-09-30 13:43:52 +02:00
CMakeLists.txt	Added support for the CMake build system	2010-08-19 15:59:24 +00:00