diff options
author | marha <marha@users.sourceforge.net> | 2013-12-27 19:26:33 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-12-27 19:26:33 +0100 |
commit | 68c12003597662f95eac07ddeee99637f7caa3e5 (patch) | |
tree | 7be6c75560e85d73363da29707ed674ecf11552f /libxcb | |
parent | e8eef3451671e4bea36194c85c16241e80163f8d (diff) | |
parent | f93b0a79de9ea56bea3e24797cc72625d9dcee3c (diff) | |
download | vcxsrv-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')
-rw-r--r-- | libxcb/NEWS | 2 | ||||
-rw-r--r-- | libxcb/configure.ac | 2 | ||||
-rw-r--r-- | libxcb/xcb-proto/NEWS | 2 | ||||
-rw-r--r-- | libxcb/xcb-proto/configure.ac | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libxcb/NEWS b/libxcb/NEWS index d0198f59c..0152bcba6 100644 --- a/libxcb/NEWS +++ b/libxcb/NEWS @@ -1,4 +1,4 @@ -Release 1.10 (2013-12-XX) +Release 1.10 (2013-12-22) ========================= * Bump libxcb-xkb SONAME due to ABI break introduced in 1.9.2 * Enable libxcb-xkb by default diff --git a/libxcb/configure.ac b/libxcb/configure.ac index 294bd1a92..6d0f844b8 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -4,7 +4,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([libxcb], - 1.9, + 1.10, [xcb@lists.freedesktop.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) 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]) |