Merge remote-tracking branch 'origin/released'

* origin/released:
  libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013

Conflicts:
	mesalib/include/GL/glext.h
	mesalib/src/mesa/drivers/dri/common/dri_util.c
	mesalib/src/mesa/drivers/dri/swrast/swrast.c
	xorg-server/damageext/damageext.c
	xorg-server/dix/dispatch.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_program.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c
	xorg-server/hw/xwin/glx/gen_gl_wrappers.py
	xorg-server/hw/xwin/glx/glthunk.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/include/os.h
	xorg-server/present/present_request.c

1 files changed, 4 insertions, 2 deletions

diff --git a/xorg-server/present/present_request.c b/xorg-server/present/present_request.c
index cd2d334ff..275a29cdc 100644
--- a/xorg-server/present/present_request.c
+++ b/xorg-server/present/present_request.c
@@ -26,17 +26,19 @@
 
 #include "present_priv.h"
 #include "randrstr.h"
+#include <protocol-versions.h>
 
 static int
 proc_present_query_version(ClientPtr client)
 {
     xPresentQueryVersionReply rep;
     REQUEST(xPresentQueryVersionReq);
+
         rep.type = X_Reply;
         rep.sequenceNumber = client->sequence;
         rep.length = 0;
-        rep.majorVersion = PRESENT_MAJOR;
-        rep.minorVersion = PRESENT_MINOR;
+        rep.majorVersion = SERVER_PRESENT_MAJOR_VERSION;
+        rep.minorVersion = SERVER_PRESENT_MINOR_VERSION;
 
 
     REQUEST_SIZE_MATCH(xPresentQueryVersionReq);