[PULL] input changes for 25.03.2011

[Keith Packard]

On Sun, 27 Mar 2011 18:23:32 -0700, Keith Packard <keithp at keithp.com> wrote:
> On Fri, 25 Mar 2011 11:29:07 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> > The following changes since commit 03f45df93469f6aef391e97007b9614e0770cc4c:
> 
> > Erkki Seppälä (1):
> >       config: handle device change event properly
> > 
> > Peter Hutterer (2):
> >       xfree86: print out which driver is about to be used.
> >       test: when unit tests are enabled, build them during "make"
> > 
> > Simon Thum (5):
> >       xquartz: simplify ChangeDeviceControl
> >       kdrive: don't pretent to support DEVICE_ABS_* in ChangeDeviceControl
> >       xf86: don't pretend to support DEVICE_ABS_* in ChangeDeviceControl
> >       simplify ChangeDeviceControl in stubs
> >       xserver: remove AbsoluteClassRec keeping the ABI
> 
> Hrm. I'm getting a mystic error when I merge this branch:
>   CCLD   protocol-eventconvert
> collect2: ld returned 1 exit status
> 
> 'make V=1' doesn't provide any more information, so I'm kinda confused
> here. Any ideas?

Ah, just ENOSPC. And I even checked for that.

Merged.
   2ef4ff4..a22486f  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110327/663b0895/attachment.pgp>