diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-26 14:37:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-26 14:37:05 +0200 |
| commit | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (patch) | |
| tree | d9b7345ddfe702b820c7020fb784f0e3dc2253bf /libxcb | |
| parent | 76bcc36ed305418a3ddc5752d287ede894243e1b (diff) | |
| parent | 1d6d472342aee7b9c68e9f1d92762ef808d35ac2 (diff) | |
| download | vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.gz vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.bz2 vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libxcb')
| -rw-r--r-- | libxcb/xcb-proto/NEWS | 6 | ||||
| -rw-r--r-- | libxcb/xcb-proto/configure.ac | 2 | ||||
| -rw-r--r-- | libxcb/xcb-proto/xcbgen/xtypes.py | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/libxcb/xcb-proto/NEWS b/libxcb/xcb-proto/NEWS index 32bcc6924..3e50762ab 100644 --- a/libxcb/xcb-proto/NEWS +++ b/libxcb/xcb-proto/NEWS @@ -1,3 +1,9 @@ +Release 1.7.1 (2012-03-23) +========================== +* Add ge and xf86vidmode protocol descriptions +* Remove now unnecessary files as everything is implemented in xcbgen +* Rename the ExprType "parent" attribute to "parents" + Release 1.7 (2012-01-11) ======================== * Add missing padding bytes to ChangeKeyboardMapping request diff --git a/libxcb/xcb-proto/configure.ac b/libxcb/xcb-proto/configure.ac index 5368e2a05..e20c9aa1e 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.7.1, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/libxcb/xcb-proto/xcbgen/xtypes.py b/libxcb/xcb-proto/xcbgen/xtypes.py index 14c318ac3..c78915846 100644 --- a/libxcb/xcb-proto/xcbgen/xtypes.py +++ b/libxcb/xcb-proto/xcbgen/xtypes.py @@ -221,11 +221,11 @@ class ExprType(Type): Public fields added: expr is an Expression object containing the value of the field. ''' - def __init__(self, elt, member, *parent): + def __init__(self, elt, member, *parents): Type.__init__(self, member.name) self.is_expr = True self.member = member - self.parent = parent + self.parents = parents self.expr = Expression(list(elt)[0], self) |