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
..
SFML	Merge branch 'master' into drawables	2011-12-02 20:58:14 +01:00