[PULL] misc changes

[Peter Hutterer]

The following changes since commit b6e5c4669e0db391966deb397e8c975ec7f0124d:

  test/xi2: fix protocol-xiqueryversion test (2013-08-01 14:56:54 +1000)

are available in the git repository at:

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

for you to fetch changes up to 024c9cace0866243cf3b6d28121761badf2f626e:

  Allow disabling XFree86-DGA, DRI, VidModeExtension extensions (2013-08-06 14:51:23 +1000)

----------------------------------------------------------------
Alan Coopersmith (1):
      Allow disabling XFree86-DGA, DRI, VidModeExtension extensions

Julien Cristau (2):
      test: include dix-config.h in hashtabletest.c
      xfree86: improve check for posix saved ids

Peter Hutterer (2):
      Replace INCLUDES with AM_CPPFLAGS
      xfree86: de-duplicate some AM_CPPFLAGS

 configure.ac                              | 2 +-
 exa/Makefile.am                           | 2 +-
 glx/Makefile.am                           | 4 ++--
 hw/kdrive/ephyr/Makefile.am               | 2 +-
 hw/kdrive/fake/Makefile.am                | 2 +-
 hw/kdrive/fbdev/Makefile.am               | 2 +-
 hw/kdrive/linux/Makefile.am               | 2 +-
 hw/kdrive/src/Makefile.am                 | 2 +-
 hw/xfree86/Makefile.am                    | 4 ++--
 hw/xfree86/common/Makefile.am             | 2 +-
 hw/xfree86/ddc/Makefile.am                | 2 +-
 hw/xfree86/dixmods/Makefile.am            | 2 +-
 hw/xfree86/exa/Makefile.am                | 2 +-
 hw/xfree86/fbdevhw/Makefile.am            | 2 +-
 hw/xfree86/i2c/Makefile.am                | 2 +-
 hw/xfree86/int10/Makefile.am              | 6 +++---
 hw/xfree86/loader/Makefile.am             | 2 +-
 hw/xfree86/modes/Makefile.am              | 2 +-
 hw/xfree86/os-support/bsd/Makefile.am     | 2 +-
 hw/xfree86/os-support/bus/Makefile.am     | 2 +-
 hw/xfree86/os-support/hurd/Makefile.am    | 2 +-
 hw/xfree86/os-support/linux/Makefile.am   | 2 +-
 hw/xfree86/os-support/misc/Makefile.am    | 2 +-
 hw/xfree86/os-support/solaris/Makefile.am | 2 +-
 hw/xfree86/os-support/stub/Makefile.am    | 2 +-
 hw/xfree86/parser/Makefile.am             | 2 +-
 hw/xfree86/parser/write.c                 | 3 ++-
 hw/xfree86/ramdac/Makefile.am             | 2 +-
 hw/xfree86/shadowfb/Makefile.am           | 2 +-
 hw/xfree86/utils/cvt/Makefile.am          | 2 +-
 hw/xfree86/vbe/Makefile.am                | 2 +-
 hw/xfree86/vgahw/Makefile.am              | 2 +-
 hw/xfree86/x86emu/Makefile.am             | 2 +-
 hw/xwin/Makefile.am                       | 2 +-
 hw/xwin/glx/Makefile.am                   | 2 +-
 include/xorg-config.h.in                  | 3 +++
 mi/miinitext.c                            | 2 +-
 miext/damage/Makefile.am                  | 2 +-
 miext/sync/Makefile.am                    | 2 +-
 test/Makefile.am                          | 4 ++--
 test/hashtabletest.c                      | 4 ++++
 test/xi2/Makefile.am                      | 2 +-
 42 files changed, 53 insertions(+), 45 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130806/d7feb246/attachment.pgp>