Merge remote-tracking branch 'herrb/master'
authorKeith Packard <keithp@keithp.com>
Mon, 3 Oct 2011 20:56:06 +0000 (13:56 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 3 Oct 2011 20:56:06 +0000 (13:56 -0700)
commit6378d0233d21088b6429755627b4253859892c72
tree46061506e4ddda8163c56f14d614f3d620dffe68
parent6e965d8a185087a55b2100b817e18f05b3ce5a00
parent98b230669f591bf5b8b8764db3b287d91857ee9e
Merge remote-tracking branch 'herrb/master'
configure.ac
hw/xfree86/common/xf86Config.c
hw/xfree86/common/xf86Globals.c
hw/xfree86/common/xf86Xinput.c