xserver: Branch 'master' - 3 commits

[Brian Paul]

 hw/dmx/dmx-config.h      |    2 +-
 hw/dmx/glxProxy/glxext.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 873ef75b1e8c94d39670c981c4d830ab8bcc018b (from 6b33459bf5aac23c3ecc7002d091c02f327d907a)
Author: Colin Guthrie <gmane at colin.guthr.ie>
Date:   Mon Apr 30 10:33:12 2007 -0600

    fix __glXErrorCallBack() proto

diff --git a/hw/dmx/glxProxy/glxext.h b/hw/dmx/glxProxy/glxext.h
index 8572aa4..0113937 100644
--- a/hw/dmx/glxProxy/glxext.h
+++ b/hw/dmx/glxProxy/glxext.h
@@ -67,7 +67,7 @@ extern void __glXFreeGLXPixmap( __GLXpix
 
 extern void __glXNoSuchRenderOpcode(GLbyte*);
 extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
-extern void __glXErrorCallBack(__GLinterface *gc, GLenum code);
+extern void __glXErrorCallBack(GLenum code);
 extern void __glXClearErrorOccured(void);
 extern GLboolean __glXErrorOccured(void);
 extern void __glXResetLargeCommandStatus(__GLXclientState*);
diff-tree 6b33459bf5aac23c3ecc7002d091c02f327d907a (from parents)
Merge: 18252a515d4989b983a3b7389636045e06d0f246 3c91a993e8c752002adf85c317216e1487c20780
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Apr 30 10:26:19 2007 -0600

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/xorg/xserver

diff-tree 18252a515d4989b983a3b7389636045e06d0f246 (from ce099a9b78195540ec251a6a3dbe26019c1a686d)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Apr 24 14:10:09 2007 -0600

    bump release date to reflect input code updates

diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h
index 9647448..18a0535 100644
--- a/hw/dmx/dmx-config.h
+++ b/hw/dmx/dmx-config.h
@@ -66,7 +66,7 @@
     ((year-2000) *     10000) + \
     ((month)     *       100) + \
     ((day)       *         1)
-#define VENDOR_RELEASE  DMX_VENDOR_RELEASE(1,2,2004,6,30)
+#define VENDOR_RELEASE  DMX_VENDOR_RELEASE(1,2,2007,4,24)
 #define VENDOR_STRING   "DMX Project"
 
 /* Enable the DMX extension */