diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-31 09:26:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-31 09:26:04 -0700 |
| commit | 69533fc04f38c67fd424776c5191a4ba57ba8c8f (patch) | |
| tree | b260e1e2a35c02fee21d93e1dcd119cde15589f0 /hw/xfree86/Makefile.am | |
| parent | ef1aecaaf6cd7e9e4f9d0c6373664e774500bc13 (diff) | |
| parent | 24051ef97406f28c102cf46a78223400b61fdae2 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
Diffstat (limited to 'hw/xfree86/Makefile.am')
| -rw-r--r-- | hw/xfree86/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index be0af3542..95a4eb99c 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -7,12 +7,12 @@ DOC_SUBDIR = doc SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ xf8_32bpp loader dixmods exa \ - $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig + $(DRI_SUBDIR) utils $(DOC_SUBDIR) DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ xf8_16bpp xf8_32bpp loader dixmods dri exa \ - utils doc getconfig + utils doc bin_PROGRAMS = Xorg |