[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.82.7.1+dfsg1-2-6-gb5ca8b6

[Jan Dittberner]

The following commit has been merged in the master branch:
commit fea882eee9eee2dc101af423c97d9cddcbd9bb7f
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue May 3 14:41:00 2011 +0200

    fix FTBFS with g++ 4.6.0 in rts/Rendering/GLContext.cpp

diff --git a/debian/patches/ftbfs-fix-625097.patch b/debian/patches/ftbfs-fix-625097.patch
index 55354f8..f49049d 100644
--- a/debian/patches/ftbfs-fix-625097.patch
+++ b/debian/patches/ftbfs-fix-625097.patch
@@ -45,3 +45,13 @@ Bug: http://springrts.com/mantis/view.php?id=2415
  	float x1, x2, y1, y2;
  	float xmid, ymid;
  	float p17, p18;
+--- a/rts/Rendering/GLContext.cpp
++++ b/rts/Rendering/GLContext.cpp
+@@ -9,6 +9,7 @@
+ #include "GLContext.h"
+ 
+ #include <list>
++#include <cstddef>  // for NULL
+ 
+ 
+ using namespace std;

-- 
advanced 3D real time strategy game engine