[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.6+repack1-123-g8299f07

[Dmitrijs Ledkovs]

The following commit has been merged in the master branch:
commit ff6621bb197b553a03cb45404800dff9b1fd47d5
Author: Dmitrijs Ledkovs <xnox at debian.org>
Date:   Sun May 27 18:06:20 2012 +0100

    Remove patch

diff --git a/debian/patches/debian/fix-includes.diff b/debian/patches/debian/fix-includes.diff
deleted file mode 100644
index 32d9ab8..0000000
--- a/debian/patches/debian/fix-includes.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Christoph Egger <christoph at debian.org>
-Subject: [PATCH] debian/fix-includes
-
-SFML needs sme modified includes to build against gcc-4.6
-
-Signed-off-by: Christoph Egger <christoph at debian.org>
-
----
- include/SFML/System/ResourcePtr.inl |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp
-===================================================================
---- libsfml-1.6+dfsg1.orig/include/SFML/System/Resource.hpp	2011-09-21 15:03:16.449574957 +0000
-+++ libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp	2011-09-21 15:03:34.429601847 +0000
-@@ -29,6 +29,7 @@
- // Headers
- ////////////////////////////////////////////////////////////
- #include <set>
-+#include <cstddef>
- 
- 
- namespace sf

-- 
Simple and fast multimedia library for C++