diff options
author | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
commit | 9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch) | |
tree | 13452621f70604f08fd91b1bd46ed6341dbc2ea7 /libxcb/configure.ac | |
parent | bd13c464f728719fceb8a4918b52727ec125ea6e (diff) | |
parent | de8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff) | |
download | vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2 vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'libxcb/configure.ac')
-rw-r--r-- | libxcb/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libxcb/configure.ac b/libxcb/configure.ac index 3f44b534d..736438305 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -4,7 +4,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([libxcb], - 1.8.1, + 1.9, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb.pc.in]) # Set common system defines for POSIX extensions, such as _GNU_SOURCE |