SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
380b51d605a82c98082a2cebd70a0d1d0735eaa7
xserver_xsdl/hw/xfree86/common
History
Ian Romanick 380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
2006-07-25 11:30:04 -07:00
..
atKeynames.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
compiler.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
extramodes
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
fourcc.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Makefile.am
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-21 15:25:35 -07:00
modeline2c.pl
Include xorg-config.h so the generated file will also include it.
2005-09-27 13:47:26 +00:00
scoasm.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
vesamodes
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
xf86.h
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86AutoConfig.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86Build.h.in
Add auto-generated header files.
2005-07-01 21:15:20 +00:00
xf86Bus.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86Bus.h
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86cmap.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86cmap.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Config.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Config.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Configure.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86Cursor.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Date.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Debug.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86DefModes.c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
2005-07-03 07:02:09 +00:00
xf86DGA.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86DoProbe.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86DoScanPci.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86DPMS.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Events.c
Make sure <execinfo.h> is actually included when needed.
2006-06-24 15:09:24 +02:00
xf86fbBus.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86fbman.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86fbman.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Globals.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Helper.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86Init.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86InPriv.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Io.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86isaBus.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Kbd.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86KbdBSD.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86KbdLnx.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86KbdMach.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Keymap.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86MiscExt.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Mode.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Module.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86noBus.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Opt.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Option.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86pciBus.c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86pciBus.h
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86PciInfo.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86PM.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Priv.h
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86Privstr.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86RandR.c
Fix the RandR failure path for rotated screens.
2006-07-21 15:20:40 -07:00
xf86Resources.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86sbusBus.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86sbusBus.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86str.h
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-25 11:30:04 -07:00
xf86Version.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Versions.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86VidMode.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Xinput.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86Xinput.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86XKB.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86xv.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86xv.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86xvmc.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86xvmc.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xf86xvpriv.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xisb.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xisb.h
Remove libc wrapper types from Xisb interfaces.
2006-04-07 16:08:50 +00:00
xorgHelper.c
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
xorgVersion.h
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00