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/xcb-proto | |
| 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/xcb-proto')
| -rw-r--r-- | libxcb/xcb-proto/NEWS | 6 | ||||
| -rw-r--r-- | libxcb/xcb-proto/configure.ac | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS index 3e50762ab..ebe184532 100644 --- a/libxcb/xcb-proto/NEWS +++ b/libxcb/xcb-proto/NEWS @@ -1,3 +1,9 @@ +Release 1.8 (2012-10-05) +======================== +* dri2: Update to DRI2 1.4 +* XKB: Fix broken events +* xproto: add doc tags, xcbgen: handle doc tags + Release 1.7.1 (2012-03-23) ========================== * Add ge and xf86vidmode protocol descriptions diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac index e20c9aa1e..ba6a90cd8 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.7.1, + 1.8, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) |