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

..

resources

Added support for the CMake build system

2010-08-19 15:59:24 +00:00

CMakeLists.txt

Added explicit include directories for OpenGL and X11 in CMake files

2011-09-30 13:43:52 +02:00

OpenGL.cpp

Implemented the new graphics API:

2011-12-01 23:24:58 +01:00