Merge remote-tracking branch 'alanc/master'
authorKeith Packard <keithp@keithp.com>
Wed, 21 Sep 2011 21:30:19 +0000 (14:30 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 21 Sep 2011 21:30:19 +0000 (14:30 -0700)
commit98f4940093dc90c3366d3e4d3ddceacbaee299dc
tree56ad6fa0d3586ecd422f9ca82a2728071fefb8f7
parentb018b815333b256b5e06dd6251b2e539f09f89fa
parentc8eacae4f833a0bd81907ba2b4cfaa80c08e037f
Merge remote-tracking branch 'alanc/master'
dix/dispatch.c
hw/xfree86/common/xf86Globals.c
hw/xfree86/common/xf86Privstr.h