diff options
author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /libxcb/configure.ac | |
parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
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 9abaffced..e94e32c7b 100644 --- a/libxcb/configure.ac +++ b/libxcb/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([libxcb], - 1.8, + 1.8.1, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) |