Merge remote-tracking branch 'whot/next'
authorKeith Packard <keithp@keithp.com>
Tue, 27 Sep 2011 03:24:15 +0000 (20:24 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 27 Sep 2011 03:24:15 +0000 (20:24 -0700)
commitafb1fe695d197187a301c19863a128a65389b15c
treed1ec3b11b8ca521cb77ff1d6821786d3dfc6a5e1
parent7fb4bef0394a5d09680985d34bce8252b61493cb
parentc7163fdd302f706a3d67f0fdf93eeb3396bb3332
Merge remote-tracking branch 'whot/next'
Xi/xipassivegrab.c
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Config.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86Init.c
hw/xfree86/man/xorg.conf.man