hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-15 00:13:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework

Browse source 
Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
This commit is contained in:
Ian Romanick 2006-07-21 15:25:35 -07:00
commit 07ad92d2c4
162 changed files with 384 additions and 1032 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/common/Makefile.am
View file

@ -103,4 +103,4 @@ if LNXACPI
XORG_CFLAGS += -DHAVE_ACPI
endif
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
AM_CFLAGS = $(XORG_CFLAGS)