aboutsummaryrefslogtreecommitdiff
path: root/libxcb/xcb-proto
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-12-27 19:26:33 +0100
committermarha <marha@users.sourceforge.net>2013-12-27 19:26:33 +0100
commit68c12003597662f95eac07ddeee99637f7caa3e5 (patch)
tree7be6c75560e85d73363da29707ed674ecf11552f /libxcb/xcb-proto
parente8eef3451671e4bea36194c85c16241e80163f8d (diff)
parentf93b0a79de9ea56bea3e24797cc72625d9dcee3c (diff)
downloadvcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.gz
vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.tar.bz2
vcxsrv-68c12003597662f95eac07ddeee99637f7caa3e5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver libxcb xcbproto mesa xkeyboard-config git update 27 Dec 2013
Diffstat (limited to 'libxcb/xcb-proto')
-rw-r--r--libxcb/xcb-proto/NEWS2
-rw-r--r--libxcb/xcb-proto/configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS
index 50ced6186..02727faf4 100644
--- a/libxcb/xcb-proto/NEWS
+++ b/libxcb/xcb-proto/NEWS
@@ -1,4 +1,4 @@
-Release 1.10 (2013-12-XX)
+Release 1.10 (2013-12-22)
=========================
* xkb: comment out portions that libxcb doesn't handle properly
* Present: Remove reference to nonexistent enum
diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac
index c82c8c749..a235f930c 100644
--- a/libxcb/xcb-proto/configure.ac
+++ b/libxcb/xcb-proto/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([XCB Proto],
- 1.9,
+ 1.10,
[xcb@lists.freedesktop.org])
AC_CONFIG_SRCDIR([xcb-proto.pc.in])
AM_INIT_AUTOMAKE([foreign dist-bzip2])