[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 85604458a815c957132c1bc865e3db47b1f48313
Author: Jan Dittberner <jandd at debian.org>
Date:   Tue May 3 15:57:34 2011 +0200

    fix FTBFS with g++ 4.6.0 in rts/System/MemPool.h

diff --git a/debian/patches/ftbfs-fix-625097.patch b/debian/patches/ftbfs-fix-625097.patch
index f49049d..4f6865c 100644
--- a/debian/patches/ftbfs-fix-625097.patch
+++ b/debian/patches/ftbfs-fix-625097.patch
@@ -1,4 +1,4 @@
-From: hoijui
+From: Jan Dittberner <jandd at debian.org>
 Subject: Patch for FTBFS with g++ 4.6.0
 Bug-Debian: http://bugs.debian.org/625097
 Bug: http://springrts.com/mantis/view.php?id=2415
@@ -55,3 +55,13 @@ Bug: http://springrts.com/mantis/view.php?id=2415
  
  
  using namespace std;
+--- a/rts/System/MemPool.h
++++ b/rts/System/MemPool.h
+@@ -4,6 +4,7 @@
+ #define _MEM_POOL_H_
+ 
+ #include <new>
++#include <cstddef> // for NULL
+ 
+ const size_t MAX_MEM_SIZE=200;
+ 

-- 
advanced 3D real time strategy game engine