[PULL] input ABI bump, unit test fixes

Submitted by Peter Hutterer on March 28, 2012, 10:16 p.m.

Details

Message ID 20120328221610.GA31642@yabbi.redhat.com
State Accepted
Headers show

Pull-request

git://people.freedesktop.org/~whot/xserver for-keith

Commit Message

Peter Hutterer March 28, 2012, 10:16 p.m.
The following changes since commit 7f3997b01a8813c1d7055317eb06111aed8572c9:

  Merge remote-tracking branch 'jeremyhu/master' (2012-03-26 16:41:52 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

Peter Hutterer (3):
      Bump input ABI to 17 for per-device idlecounters
      test: init the sync extensions for tests to pass again
      test: reset the client before checking the swapped version

 hw/xfree86/common/xf86Module.h     |    2 +-
 test/xi2/protocol-common.c         |   14 ++++++++++++++
 test/xi2/protocol-xiqueryversion.c |    1 +
 test/xtest.c                       |   13 +++++++++++++
 4 files changed, 29 insertions(+), 1 deletions(-)

Comments

Keith Packard March 28, 2012, 10:52 p.m.
<#part sign=pgpmime>
On Thu, 29 Mar 2012 08:16:10 +1000, Peter Hutterer <peter.hutterer@who-t.net> wrote:

> Peter Hutterer (3):
>       Bump input ABI to 17 for per-device idlecounters
>       test: init the sync extensions for tests to pass again
>       test: reset the client before checking the swapped version

Merged.
   7f3997b..641a1b9  master -> master