[X2go-Commits] x2goagent.git - master (branch) updated: 3.5.0.2-5-g47bf359

[X2go dev team]

The branch, master has been updated
       via  47bf359aaafda74574c73baa5531cbf8d50795b4 (commit)
      from  409a7f460e403df3060ddeab84ed670e7f85470f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47bf359aaafda74574c73baa5531cbf8d50795b4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 5 14:58:33 2011 +0200

    Patch for glcontextmodes.c taken from comparison between x2goagent in Git and a non-Git version of x2goagent.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    4 ++++
 .../src/mesa/drivers/dri/common/glcontextmodes.c   |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 599dec4..1b34d64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ x2goagent (3.5.0.5-0~x2go1) UNRELEASED; urgency=low
     - still using nxauth-3.5.0-1
   * Status
 
+  [ Mike Gabriel ]
+  * Patch for glcontextmodes.c taken from comparison between x2goagent in Git and
+    a non-Git version of x2goagent.
+
  -- Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>  Tue, 04 Oct 2011 08:11:22 +0200
 
 x2goagent (3.5.0.2-0~x2go1) unstable; urgency=low
diff --git a/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
index 5e9e352..066c5ff 100644
--- a/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
@@ -44,6 +44,7 @@
 # include "GL/glxint.h"
 
 # ifdef XFree86Server
+void *memset( void * ptr, int val, size_t size);
 #  include "GL/glx_ansic.h"
 extern void * __glXMalloc( size_t size );
 extern void __glXFree( void * ptr );


hooks/post-receive
-- 
x2goagent.git (X2go (NX-like) Agent)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goagent.git" (X2go (NX-like) Agent).