summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GL/glx/renderpix.c1
-rw-r--r--GL/glx/renderpixswap.c1
-rw-r--r--GL/glx/singlepix.c1
-rw-r--r--GL/glx/singlesize.h1
-rw-r--r--GL/glx/xfont.c1
-rw-r--r--XTrap/xtrapdiswp.c1
-rw-r--r--XTrap/xtrapditbl.c1
-rw-r--r--Xext/fontcache.c2
-rw-r--r--Xext/panoramiX.h1
-rw-r--r--Xext/sampleEVI.c1
-rw-r--r--Xext/shmint.h2
-rw-r--r--Xext/xcalibrate.c2
-rw-r--r--Xext/xvdisp.h2
-rw-r--r--afb/afbbres.c1
-rw-r--r--afb/afbbresd.c1
-rw-r--r--afb/afbbstore.c1
-rw-r--r--afb/afbfont.c1
-rw-r--r--afb/afbmisc.c1
-rw-r--r--afb/afbpntwin.c1
-rw-r--r--cfb/cfbcppl.c2
-rw-r--r--cfb/cfbtab.h2
-rw-r--r--composite/compalloc.c2
-rw-r--r--composite/compext.c3
-rw-r--r--composite/compinit.c2
-rw-r--r--composite/compint.h2
-rw-r--r--composite/compwindow.c2
-rwxr-xr-xdamageext/damageext.c2
-rw-r--r--damageext/damageext.h2
-rw-r--r--damageext/damageextint.h2
-rw-r--r--dbe/dbestruct.h1
-rw-r--r--dbe/midbe.h3
-rw-r--r--dix/main.c2
-rw-r--r--dix/resource.c2
-rw-r--r--dix/xpstubs.c1
-rw-r--r--fb/fb24_32.h2
-rw-r--r--fb/fballpriv.c2
-rw-r--r--fb/fbarc.c2
-rw-r--r--fb/fbbits.c2
-rw-r--r--fb/fbbits.h2
-rw-r--r--fb/fbblt.c2
-rw-r--r--fb/fbbltone.c2
-rw-r--r--fb/fbbstore.c2
-rw-r--r--fb/fbcopy.c2
-rw-r--r--fb/fbfill.c2
-rw-r--r--fb/fbfillrect.c2
-rw-r--r--fb/fbfillsp.c2
-rw-r--r--fb/fbgc.c2
-rw-r--r--fb/fbgetsp.c2
-rw-r--r--fb/fbimage.c2
-rw-r--r--fb/fbline.c2
-rw-r--r--fb/fbpixmap.c2
-rw-r--r--fb/fbpoint.c2
-rw-r--r--fb/fbpush.c2
-rw-r--r--fb/fbrop.h2
-rw-r--r--fb/fbseg.c2
-rw-r--r--fb/fbsetsp.c2
-rw-r--r--fb/fbsolid.c2
-rw-r--r--fb/fbstipple.c2
-rw-r--r--fb/fbtile.c2
-rw-r--r--fb/fbtrap.c2
-rw-r--r--fb/fbutil.c2
-rw-r--r--fb/fbwindow.c2
-rw-r--r--hw/darwin/apple/X11Application.h1
-rw-r--r--hw/darwin/apple/X11Controller.h1
-rw-r--r--hw/darwin/apple/bundle-main.c1
-rw-r--r--hw/darwin/quartz/XApplication.h1
-rw-r--r--hw/darwin/quartz/cr/cr.h1
-rw-r--r--hw/darwin/quartz/keysym2ucs.c3
-rw-r--r--hw/darwin/quartz/keysym2ucs.h3
-rw-r--r--hw/darwin/quartz/quartzKeyboard.c1
-rw-r--r--hw/darwin/quartz/xpr/Xplugin.h1
-rw-r--r--hw/darwin/quartz/xpr/appledri.h1
-rw-r--r--hw/darwin/quartz/xpr/appledristr.h1
-rw-r--r--hw/darwin/quartz/xpr/x-hash.c1
-rw-r--r--hw/darwin/quartz/xpr/x-hash.h1
-rw-r--r--hw/darwin/quartz/xpr/x-hook.c2
-rw-r--r--hw/darwin/quartz/xpr/x-hook.h2
-rw-r--r--hw/darwin/quartz/xpr/x-list.c1
-rw-r--r--hw/darwin/quartz/xpr/x-list.h1
-rw-r--r--hw/dmx/config/Canvas.c1
-rw-r--r--hw/dmx/config/Canvas.h1
-rw-r--r--hw/dmx/config/CanvasP.h1
-rw-r--r--hw/dmx/config/dmxcompat.c1
-rw-r--r--hw/dmx/config/dmxcompat.h1
-rw-r--r--hw/dmx/config/dmxconfig.c1
-rw-r--r--hw/dmx/config/dmxconfig.h1
-rw-r--r--hw/dmx/config/dmxparse.c1
-rw-r--r--hw/dmx/config/dmxparse.h1
-rw-r--r--hw/dmx/config/dmxprint.c1
-rw-r--r--hw/dmx/config/dmxprint.h1
-rw-r--r--hw/dmx/config/dmxtodmx.c1
-rw-r--r--hw/dmx/config/vdltodmx.c1
-rw-r--r--hw/dmx/config/xdmxconfig.c3
-rw-r--r--hw/dmx/dmx.c1
-rw-r--r--hw/dmx/dmx.h1
-rw-r--r--hw/dmx/dmxcb.c1
-rw-r--r--hw/dmx/dmxcb.h1
-rw-r--r--hw/dmx/dmxclient.h1
-rw-r--r--hw/dmx/dmxcmap.c1
-rw-r--r--hw/dmx/dmxcmap.h1
-rw-r--r--hw/dmx/dmxcursor.c1
-rw-r--r--hw/dmx/dmxcursor.h1
-rw-r--r--hw/dmx/dmxdpms.c1
-rw-r--r--hw/dmx/dmxdpms.h1
-rw-r--r--hw/dmx/dmxextension.c1
-rw-r--r--hw/dmx/dmxextension.h1
-rw-r--r--hw/dmx/dmxfont.c1
-rw-r--r--hw/dmx/dmxfont.h1
-rw-r--r--hw/dmx/dmxgc.c1
-rw-r--r--hw/dmx/dmxgc.h1
-rw-r--r--hw/dmx/dmxgcops.c1
-rw-r--r--hw/dmx/dmxgcops.h1
-rw-r--r--hw/dmx/dmxinit.c1
-rw-r--r--hw/dmx/dmxinit.h1
-rw-r--r--hw/dmx/dmxinput.c1
-rw-r--r--hw/dmx/dmxinput.h1
-rw-r--r--hw/dmx/dmxlog.c1
-rw-r--r--hw/dmx/dmxlog.h1
-rw-r--r--hw/dmx/dmxpict.c1
-rw-r--r--hw/dmx/dmxpict.h1
-rw-r--r--hw/dmx/dmxpixmap.c1
-rw-r--r--hw/dmx/dmxpixmap.h1
-rw-r--r--hw/dmx/dmxprop.c1
-rw-r--r--hw/dmx/dmxprop.h1
-rw-r--r--hw/dmx/dmxscrinit.c1
-rw-r--r--hw/dmx/dmxscrinit.h1
-rw-r--r--hw/dmx/dmxshadow.c1
-rw-r--r--hw/dmx/dmxshadow.h1
-rw-r--r--hw/dmx/dmxstat.c1
-rw-r--r--hw/dmx/dmxstat.h1
-rw-r--r--hw/dmx/dmxsync.c1
-rw-r--r--hw/dmx/dmxsync.h1
-rw-r--r--hw/dmx/dmxvisual.c1
-rw-r--r--hw/dmx/dmxvisual.h1
-rw-r--r--hw/dmx/dmxwindow.c1
-rw-r--r--hw/dmx/dmxwindow.h1
-rw-r--r--hw/dmx/examples/dmxaddinput.c1
-rw-r--r--hw/dmx/examples/dmxaddscreen.c1
-rw-r--r--hw/dmx/examples/dmxreconfig.c1
-rw-r--r--hw/dmx/examples/dmxresize.c1
-rw-r--r--hw/dmx/examples/dmxrminput.c1
-rw-r--r--hw/dmx/examples/dmxrmscreen.c1
-rw-r--r--hw/dmx/examples/dmxwininfo.c1
-rw-r--r--hw/dmx/examples/ev.c1
-rw-r--r--hw/dmx/examples/evi.c1
-rw-r--r--hw/dmx/examples/res.c1
-rw-r--r--hw/dmx/examples/xbell.c1
-rw-r--r--hw/dmx/examples/xdmx.c1
-rw-r--r--hw/dmx/examples/xinput.c1
-rw-r--r--hw/dmx/examples/xled.c1
-rw-r--r--hw/dmx/examples/xtest.c1
-rw-r--r--hw/dmx/glxProxy/glxswap.c1
-rw-r--r--hw/dmx/glxProxy/glxswap.h1
-rw-r--r--hw/dmx/input/ChkNotMaskEv.c1
-rw-r--r--hw/dmx/input/ChkNotMaskEv.h1
-rw-r--r--hw/dmx/input/dmxarg.c1
-rw-r--r--hw/dmx/input/dmxarg.h1
-rw-r--r--hw/dmx/input/dmxbackend.c1
-rw-r--r--hw/dmx/input/dmxbackend.h1
-rw-r--r--hw/dmx/input/dmxcommon.c1
-rw-r--r--hw/dmx/input/dmxcommon.h1
-rw-r--r--hw/dmx/input/dmxconsole.c1
-rw-r--r--hw/dmx/input/dmxconsole.h1
-rw-r--r--hw/dmx/input/dmxdetach.c1
-rw-r--r--hw/dmx/input/dmxdummy.c1
-rw-r--r--hw/dmx/input/dmxdummy.h1
-rw-r--r--hw/dmx/input/dmxeq.c1
-rw-r--r--hw/dmx/input/dmxeq.h1
-rw-r--r--hw/dmx/input/dmxevents.c1
-rw-r--r--hw/dmx/input/dmxevents.h1
-rw-r--r--hw/dmx/input/dmxinputinit.c1
-rw-r--r--hw/dmx/input/dmxinputinit.h1
-rw-r--r--hw/dmx/input/dmxmap.c1
-rw-r--r--hw/dmx/input/dmxmap.h1
-rw-r--r--hw/dmx/input/dmxmotion.c1
-rw-r--r--hw/dmx/input/dmxmotion.h1
-rw-r--r--hw/dmx/input/dmxsigio.c1
-rw-r--r--hw/dmx/input/dmxsigio.h1
-rw-r--r--hw/dmx/input/dmxxinput.c1
-rw-r--r--hw/dmx/input/lnx-keyboard.c1
-rw-r--r--hw/dmx/input/lnx-keyboard.h1
-rw-r--r--hw/dmx/input/lnx-ms.c1
-rw-r--r--hw/dmx/input/lnx-ms.h1
-rw-r--r--hw/dmx/input/lnx-ps2.c1
-rw-r--r--hw/dmx/input/lnx-ps2.h1
-rw-r--r--hw/dmx/input/usb-common.c1
-rw-r--r--hw/dmx/input/usb-common.h1
-rw-r--r--hw/dmx/input/usb-keyboard.c1
-rw-r--r--hw/dmx/input/usb-keyboard.h1
-rw-r--r--hw/dmx/input/usb-mouse.c1
-rw-r--r--hw/dmx/input/usb-mouse.h1
-rw-r--r--hw/dmx/input/usb-other.c1
-rw-r--r--hw/dmx/input/usb-other.h1
-rw-r--r--hw/dmx/input/usb-private.h1
-rw-r--r--hw/kdrive/ati/ati.c3
-rw-r--r--hw/kdrive/ati/ati.h3
-rw-r--r--hw/kdrive/ati/ati_cursor.c1
-rw-r--r--hw/kdrive/ati/ati_dma.c1
-rw-r--r--hw/kdrive/ati/ati_dma.h1
-rw-r--r--hw/kdrive/ati/ati_draw.c3
-rw-r--r--hw/kdrive/ati/ati_draw.h1
-rw-r--r--hw/kdrive/ati/ati_drawtmp.h3
-rw-r--r--hw/kdrive/ati/ati_dri.c3
-rw-r--r--hw/kdrive/ati/ati_dri.h3
-rw-r--r--hw/kdrive/ati/ati_reg.h1
-rw-r--r--hw/kdrive/ati/ati_sarea.h4
-rw-r--r--hw/kdrive/ati/ati_stub.c3
-rw-r--r--hw/kdrive/ati/ati_video.c1
-rw-r--r--hw/kdrive/ati/r128_blendtmp.h3
-rw-r--r--hw/kdrive/ati/r128_composite.c1
-rw-r--r--hw/kdrive/ati/radeon_composite.c3
-rw-r--r--hw/kdrive/chips/chips.c1
-rw-r--r--hw/kdrive/chips/chips.h3
-rw-r--r--hw/kdrive/chips/chipsdraw.c3
-rw-r--r--hw/kdrive/chips/chipsstub.c3
-rw-r--r--hw/kdrive/epson/epson13806.c1
-rw-r--r--hw/kdrive/epson/epson13806.h1
-rw-r--r--hw/kdrive/epson/epson13806draw.c1
-rw-r--r--hw/kdrive/epson/epson13806draw.h1
-rw-r--r--hw/kdrive/epson/epson13806reg.h1
-rw-r--r--hw/kdrive/epson/epson13806stub.c1
-rw-r--r--hw/kdrive/fake/fake.c2
-rw-r--r--hw/kdrive/fake/fake.h2
-rw-r--r--hw/kdrive/fake/fakeinit.c2
-rw-r--r--hw/kdrive/fake/kbd.c3
-rw-r--r--hw/kdrive/fake/mouse.c2
-rw-r--r--hw/kdrive/fake/os.c2
-rw-r--r--hw/kdrive/fbdev/fbdev.c3
-rw-r--r--hw/kdrive/fbdev/fbdev.h3
-rw-r--r--hw/kdrive/fbdev/fbinit.c3
-rw-r--r--hw/kdrive/i810/i810.c3
-rw-r--r--hw/kdrive/i810/i810.h2
-rw-r--r--hw/kdrive/i810/i810_cursor.c4
-rw-r--r--hw/kdrive/i810/i810_reg.h1
-rw-r--r--hw/kdrive/i810/i810stub.c1
-rw-r--r--hw/kdrive/igs/igs.c2
-rw-r--r--hw/kdrive/igs/igs.h2
-rw-r--r--hw/kdrive/igs/igscmap.c2
-rw-r--r--hw/kdrive/igs/igscurs.c2
-rw-r--r--hw/kdrive/igs/igsdraw.c2
-rw-r--r--hw/kdrive/igs/igsdraw.h2
-rw-r--r--hw/kdrive/igs/igsreg.c2
-rw-r--r--hw/kdrive/igs/igsreg.h2
-rw-r--r--hw/kdrive/igs/igsstub.c2
-rw-r--r--hw/kdrive/ipaq/ipaq.c1
-rw-r--r--hw/kdrive/itsy/itsy.c3
-rw-r--r--hw/kdrive/itsy/itsy.h3
-rw-r--r--hw/kdrive/itsy/kbd.c3
-rw-r--r--hw/kdrive/itsy/ts.c3
-rw-r--r--hw/kdrive/linux/agp.c2
-rw-r--r--hw/kdrive/linux/bus.c2
-rw-r--r--hw/kdrive/linux/evdev.c2
-rw-r--r--hw/kdrive/linux/keyboard.c2
-rw-r--r--hw/kdrive/linux/klinux.h2
-rw-r--r--hw/kdrive/linux/linux.c2
-rw-r--r--hw/kdrive/linux/mouse.c2
-rw-r--r--hw/kdrive/linux/ms.c1
-rw-r--r--hw/kdrive/linux/ps2.c2
-rw-r--r--hw/kdrive/linux/ts.c2
-rw-r--r--hw/kdrive/mach64/mach64.c1
-rw-r--r--hw/kdrive/mach64/mach64.h3
-rw-r--r--hw/kdrive/mach64/mach64curs.c3
-rw-r--r--hw/kdrive/mach64/mach64draw.c3
-rw-r--r--hw/kdrive/mach64/mach64draw.h3
-rw-r--r--hw/kdrive/mach64/mach64stub.c3
-rw-r--r--hw/kdrive/mach64/mach64video.c1
-rw-r--r--hw/kdrive/mga/g400_common.h3
-rw-r--r--hw/kdrive/mga/g400_composite.c3
-rw-r--r--hw/kdrive/mga/mga.c3
-rw-r--r--hw/kdrive/mga/mga.h3
-rw-r--r--hw/kdrive/mga/mgadraw.c3
-rw-r--r--hw/kdrive/mga/mgastub.c3
-rw-r--r--hw/kdrive/nvidia/nvidia.c2
-rw-r--r--hw/kdrive/nvidia/nvidia.h2
-rw-r--r--hw/kdrive/nvidia/nvidiacurs.c3
-rw-r--r--hw/kdrive/nvidia/nvidiadraw.c2
-rw-r--r--hw/kdrive/nvidia/nvidiadraw.h3
-rw-r--r--hw/kdrive/nvidia/nvidiastub.c2
-rw-r--r--hw/kdrive/nvidia/nvidiavideo.c2
-rw-r--r--hw/kdrive/pcmcia/modes.h1
-rw-r--r--hw/kdrive/pcmcia/pcmcia.c1
-rw-r--r--hw/kdrive/pcmcia/pcmcia.h1
-rw-r--r--hw/kdrive/pcmcia/pcmciacurs.c1
-rw-r--r--hw/kdrive/pcmcia/pcmciarotate.c2
-rw-r--r--hw/kdrive/pcmcia/pcmciashadow.c1
-rw-r--r--hw/kdrive/pcmcia/pcmciastub.c1
-rw-r--r--hw/kdrive/r128/r128.c3
-rw-r--r--hw/kdrive/r128/r128.h3
-rw-r--r--hw/kdrive/r128/r128draw.c3
-rw-r--r--hw/kdrive/r128/r128stub.c3
-rw-r--r--hw/kdrive/savage/s3.c3
-rw-r--r--hw/kdrive/savage/s3.h3
-rw-r--r--hw/kdrive/savage/s3clock.c3
-rw-r--r--hw/kdrive/savage/s3cmap.c3
-rw-r--r--hw/kdrive/savage/s3curs.c3
-rw-r--r--hw/kdrive/savage/s3draw.c3
-rw-r--r--hw/kdrive/savage/s3draw.h3
-rw-r--r--hw/kdrive/savage/s3gc.c3
-rw-r--r--hw/kdrive/savage/s3reg.c3
-rw-r--r--hw/kdrive/savage/s3reg.h3
-rw-r--r--hw/kdrive/savage/s3rtst.c3
-rw-r--r--hw/kdrive/savage/s3stub.c3
-rw-r--r--hw/kdrive/sdl/sdl.c3
-rw-r--r--hw/kdrive/sis300/sis.c3
-rw-r--r--hw/kdrive/sis300/sis.h3
-rw-r--r--hw/kdrive/sis300/sis_draw.c3
-rw-r--r--hw/kdrive/sis300/sis_stub.c3
-rw-r--r--hw/kdrive/sis530/sis.c3
-rw-r--r--hw/kdrive/sis530/sis.h3
-rw-r--r--hw/kdrive/sis530/sisclock.c3
-rw-r--r--hw/kdrive/sis530/siscmap.c3
-rw-r--r--hw/kdrive/sis530/siscurs.c3
-rw-r--r--hw/kdrive/sis530/sisdraw.c3
-rw-r--r--hw/kdrive/sis530/sisdraw.h3
-rw-r--r--hw/kdrive/sis530/sisio.c3
-rw-r--r--hw/kdrive/sis530/sisstub.c3
-rw-r--r--hw/kdrive/smi/smi.h2
-rw-r--r--hw/kdrive/smi/smidraw.c2
-rw-r--r--hw/kdrive/smi/smidraw.h2
-rw-r--r--hw/kdrive/smi/smistub.c2
-rw-r--r--hw/kdrive/src/kaa.c2
-rw-r--r--hw/kdrive/src/kaa.h2
-rw-r--r--hw/kdrive/src/kaapict.c2
-rw-r--r--hw/kdrive/src/kasync.c3
-rw-r--r--hw/kdrive/src/kcmap.c3
-rw-r--r--hw/kdrive/src/kcolor.c3
-rw-r--r--hw/kdrive/src/kcurscol.c2
-rw-r--r--hw/kdrive/src/kdrive.c2
-rw-r--r--hw/kdrive/src/kdrive.h3
-rw-r--r--hw/kdrive/src/kinfo.c3
-rw-r--r--hw/kdrive/src/kinput.c3
-rw-r--r--hw/kdrive/src/kkeymap.c3
-rw-r--r--hw/kdrive/src/kkeymap.h3
-rw-r--r--hw/kdrive/src/kloadmap.c3
-rw-r--r--hw/kdrive/src/kmap.c3
-rw-r--r--hw/kdrive/src/kmode.c2
-rw-r--r--hw/kdrive/src/knoop.c3
-rw-r--r--hw/kdrive/src/koffscreen.c2
-rw-r--r--hw/kdrive/src/kshadow.c2
-rw-r--r--hw/kdrive/src/ktest.c3
-rw-r--r--hw/kdrive/src/kxv.c2
-rw-r--r--hw/kdrive/src/kxv.h2
-rw-r--r--hw/kdrive/src/vga.c3
-rw-r--r--hw/kdrive/src/vga.h3
-rw-r--r--hw/kdrive/trident/trident.c1
-rw-r--r--hw/kdrive/trident/trident.h3
-rw-r--r--hw/kdrive/trident/tridentcurs.c3
-rw-r--r--hw/kdrive/trident/tridentdraw.c3
-rw-r--r--hw/kdrive/trident/tridentdraw.h3
-rw-r--r--hw/kdrive/trident/tridentstub.c3
-rw-r--r--hw/kdrive/trio/s3.c3
-rw-r--r--hw/kdrive/trio/s3.h3
-rw-r--r--hw/kdrive/trio/s3clock.c3
-rw-r--r--hw/kdrive/trio/s3cmap.c3
-rw-r--r--hw/kdrive/trio/s3curs.c3
-rw-r--r--hw/kdrive/trio/s3stub.c3
-rw-r--r--hw/kdrive/ts300/ts300.c3
-rw-r--r--hw/kdrive/vesa/vbe.c1
-rw-r--r--hw/kdrive/vesa/vbe.h1
-rw-r--r--hw/kdrive/vesa/vesa.c1
-rw-r--r--hw/kdrive/vesa/vesa.h1
-rw-r--r--hw/kdrive/vesa/vesainit.c1
-rw-r--r--hw/kdrive/vesa/vga.c2
-rw-r--r--hw/kdrive/vesa/vga.h2
-rw-r--r--hw/kdrive/vesa/vm86.c2
-rw-r--r--hw/kdrive/vesa/vm86.h2
-rw-r--r--hw/kdrive/vxworks/vxkbd.c2
-rw-r--r--hw/kdrive/vxworks/vxmouse.c2
-rw-r--r--hw/kdrive/vxworks/vxworks.c2
-rw-r--r--hw/xfree86/common/atKeynames.h2
-rw-r--r--hw/xfree86/common/compiler.h2
-rw-r--r--hw/xfree86/common/xf86Cursor.c2
-rw-r--r--hw/xfree86/common/xf86Version.h3
-rw-r--r--hw/xfree86/common/xf86XKB.c1
-rw-r--r--hw/xfree86/common/xf86Xinput.c1
-rw-r--r--hw/xfree86/common/xf86Xinput.h1
-rw-r--r--hw/xfree86/common/xisb.h1
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dgaext.h2
-rw-r--r--hw/xfree86/dummylib/fatalerror.c2
-rw-r--r--hw/xfree86/dummylib/pcitestmulti.c2
-rw-r--r--hw/xfree86/dummylib/verrorf.c2
-rw-r--r--hw/xfree86/dummylib/xf86allocscripi.c2
-rw-r--r--hw/xfree86/dummylib/xf86getpagesize.c2
-rw-r--r--hw/xfree86/dummylib/xf86getverb.c2
-rw-r--r--hw/xfree86/dummylib/xf86info.c2
-rw-r--r--hw/xfree86/dummylib/xf86screens.c2
-rw-r--r--hw/xfree86/dummylib/xf86servisinit.c2
-rw-r--r--hw/xfree86/dummylib/xf86verbose.c2
-rw-r--r--hw/xfree86/i2c/uda1380.c2
-rw-r--r--hw/xfree86/i2c/uda1380.h3
-rw-r--r--hw/xfree86/modes/xf86Modes.c3
-rw-r--r--hw/xfree86/modes/xf86RandR12.c3
-rw-r--r--hw/xfree86/os-support/assyntax.h3
-rw-r--r--hw/xfree86/os-support/bsd/alpha_video.c2
-rw-r--r--hw/xfree86/os-support/bsd/arm_video.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_VTsw.c1
-rw-r--r--hw/xfree86/os-support/bsd/bsd_apm.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_init.c1
-rw-r--r--hw/xfree86/os-support/bsd/bsd_kmod.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_kqueue_apm.c1
-rw-r--r--hw/xfree86/os-support/bsd/i386_video.c2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/data.c2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/descr.c2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/parse.c2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/usage.c2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/usb.h2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/usbvar.h2
-rw-r--r--hw/xfree86/os-support/bsd/memrange.h3
-rw-r--r--hw/xfree86/os-support/bsd/ppc_video.c2
-rw-r--r--hw/xfree86/os-support/bsd/sparc64_video.c3
-rw-r--r--hw/xfree86/os-support/hurd/hurd_init.c1
-rw-r--r--hw/xfree86/os-support/hurd/hurd_mmap.c1
-rw-r--r--hw/xfree86/os-support/hurd/hurd_mouse.c1
-rw-r--r--hw/xfree86/os-support/hurd/hurd_video.c1
-rw-r--r--hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_init.c1
-rw-r--r--hw/xfree86/os-support/linux/lnx_jstk.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_video.c1
-rw-r--r--hw/xfree86/os-support/misc/IODelay.c3
-rw-r--r--hw/xfree86/os-support/misc/SlowBcopy.c3
-rw-r--r--hw/xfree86/os-support/misc/xf86_IlHack.c2
-rw-r--r--hw/xfree86/os-support/misc/xf86_Util.c1
-rw-r--r--hw/xfree86/os-support/sco/VTsw_sco.c1
-rw-r--r--hw/xfree86/os-support/sco/sco_init.c1
-rw-r--r--hw/xfree86/os-support/sco/sco_iop.c2
-rw-r--r--hw/xfree86/os-support/sco/sco_mouse.c2
-rw-r--r--hw/xfree86/os-support/sco/sco_video.c1
-rw-r--r--hw/xfree86/os-support/shared/VTsw_noop.c1
-rw-r--r--hw/xfree86/os-support/shared/VTsw_usl.c1
-rw-r--r--hw/xfree86/os-support/shared/bios_devmem.c1
-rw-r--r--hw/xfree86/os-support/shared/bios_mmap.c1
-rw-r--r--hw/xfree86/os-support/shared/ioperm_noop.c1
-rw-r--r--hw/xfree86/os-support/shared/posix_tty.c2
-rw-r--r--hw/xfree86/os-support/shared/xf86Axp.h2
-rw-r--r--hw/xfree86/os-support/sysv/sysv_init.c1
-rw-r--r--hw/xfree86/os-support/sysv/sysv_video.c1
-rw-r--r--hw/xfree86/os-support/usl/usl_init.c2
-rw-r--r--hw/xfree86/os-support/usl/usl_iop.c1
-rw-r--r--hw/xfree86/os-support/usl/usl_video.c2
-rw-r--r--hw/xfree86/os-support/usl/usl_vtsw.c2
-rw-r--r--hw/xfree86/os-support/xf86_OSlib.h2
-rw-r--r--hw/xfree86/parser/scan.c1
-rw-r--r--hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c5
-rw-r--r--hw/xfree86/utils/kbd_mode/sun-kbd_mode.c1
-rw-r--r--hw/xfree86/utils/xorgcfg/card-cfg.h1
-rw-r--r--hw/xfree86/utils/xorgcfg/help.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/mouse-cfg.h2
-rw-r--r--hw/xfree86/utils/xorgconfig/cards.h7
-rw-r--r--hw/xfree86/utils/xorgconfig/xorgconfig.c1
-rw-r--r--hw/xfree86/vgahw/vgaCmap.c1
-rw-r--r--hw/xfree86/xaa/xaaROP.c2
-rw-r--r--hw/xfree86/xaa/xaarop.h2
-rw-r--r--hw/xfree86/xf4bpp/OScompiler.h1
-rw-r--r--hw/xfree86/xf4bpp/emulOpStip.c1
-rw-r--r--hw/xfree86/xf4bpp/emulRepAre.c1
-rw-r--r--hw/xfree86/xf4bpp/emulTile.c1
-rw-r--r--hw/xfree86/xf4bpp/ibmTrace.h8
-rw-r--r--hw/xfree86/xf4bpp/mfbbres.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbbresd.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbfillarc.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbhrzvert.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbimggblt.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbline.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbzerarc.c3
-rw-r--r--hw/xfree86/xf4bpp/offscreen.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcArea.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcBStore.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcCReduce.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcClip.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcCpArea.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcDepth.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcFillRct.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcGC.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcGCstr.h1
-rw-r--r--hw/xfree86/xf4bpp/ppcGetSp.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcIO.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcImg.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcPixFS.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPixmap.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPntWin.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPolyPnt.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcQuery.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcRslvC.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcSetSp.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcSpMcro.h1
-rw-r--r--hw/xfree86/xf4bpp/ppcWinFS.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcWindow.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaBitBlt.c4
-rw-r--r--hw/xfree86/xf4bpp/vgaGC.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaImages.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaReg.h2
-rw-r--r--hw/xfree86/xf4bpp/vgaSolid.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaStipple.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaVideo.h2
-rw-r--r--hw/xfree86/xf4bpp/wm3.c7
-rw-r--r--hw/xfree86/xf4bpp/wm3.h7
-rw-r--r--hw/xfree86/xf8_32bpp/cfbcpyplane.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbgcmisc.c2
-rw-r--r--hw/xgl/egl/evdev.c2
-rw-r--r--hw/xgl/egl/kinput.c3
-rw-r--r--hw/xgl/egl/kkeymap.h3
-rw-r--r--hw/xnest/Args.c1
-rw-r--r--hw/xnest/Args.h1
-rw-r--r--hw/xnest/Color.c1
-rw-r--r--hw/xnest/Color.h1
-rw-r--r--hw/xnest/Drawable.h1
-rw-r--r--hw/xnest/Events.h1
-rw-r--r--hw/xnest/GCOps.h1
-rw-r--r--hw/xnest/Handlers.h1
-rw-r--r--hw/xnest/Keyboard.h1
-rw-r--r--hw/xnest/Pointer.c1
-rw-r--r--hw/xnest/Pointer.h1
-rw-r--r--hw/xnest/Screen.h1
-rw-r--r--hw/xnest/Visual.c1
-rw-r--r--hw/xnest/Visual.h1
-rw-r--r--hw/xnest/XNFont.h2
-rw-r--r--hw/xnest/XNGC.h1
-rw-r--r--hw/xnest/Xnest.h1
-rw-r--r--hw/xprint/ValTree.c1
-rw-r--r--hw/xprint/pcl/PclFonts.c1
-rw-r--r--hw/xprint/spooler.c1
-rw-r--r--hw/xwin/InitInput.c1
-rw-r--r--hw/xwin/InitOutput.c1
-rw-r--r--hw/xwin/ddraw.h2
-rw-r--r--hw/xwin/winconfig.h1
-rw-r--r--hw/xwin/winkeymap.h1
-rw-r--r--hw/xwin/winkeynames.h1
-rw-r--r--hw/xwin/winmsg.c1
-rw-r--r--hw/xwin/winmsg.h2
-rwxr-xr-xhw/xwin/winmultiwindowclass.c1
-rwxr-xr-xhw/xwin/winmultiwindowclass.h2
-rw-r--r--hw/xwin/winprefs.c1
-rw-r--r--hw/xwin/winprefs.h1
-rw-r--r--hw/xwin/winrop.c1
-rwxr-xr-xhw/xwin/wintrayicon.c1
-rw-r--r--include/pixmap.h1
-rw-r--r--include/pixmapstr.h1
-rw-r--r--include/window.h1
-rw-r--r--mfb/mfbwindow.c1
-rw-r--r--mi/mipoly.c1
-rw-r--r--mi/mistruct.h1
-rw-r--r--mi/mivalidate.h2
-rw-r--r--miext/cw/cw.c1
-rw-r--r--miext/cw/cw.h1
-rw-r--r--miext/cw/cw_ops.c1
-rw-r--r--miext/cw/cw_render.c1
-rwxr-xr-xmiext/damage/damage.c2
-rwxr-xr-xmiext/damage/damage.h2
-rwxr-xr-xmiext/damage/damagestr.h2
-rw-r--r--miext/shadow/shadow.c2
-rw-r--r--miext/shadow/shalloc.c2
-rw-r--r--miext/shadow/shrot16pack.c2
-rw-r--r--miext/shadow/shrot16pack_180.c2
-rw-r--r--miext/shadow/shrot16pack_270.c2
-rw-r--r--miext/shadow/shrot16pack_270YX.c2
-rw-r--r--miext/shadow/shrot16pack_90.c2
-rw-r--r--miext/shadow/shrot16pack_90YX.c2
-rw-r--r--miext/shadow/shrot32pack.c2
-rw-r--r--miext/shadow/shrot32pack_180.c2
-rw-r--r--miext/shadow/shrot32pack_270.c2
-rw-r--r--miext/shadow/shrot32pack_90.c2
-rw-r--r--miext/shadow/shrot8pack.c2
-rw-r--r--miext/shadow/shrot8pack_180.c2
-rw-r--r--miext/shadow/shrot8pack_270.c2
-rw-r--r--miext/shadow/shrot8pack_90.c2
-rw-r--r--miext/shadow/shrotpackYX.h2
-rw-r--r--os/strlcat.c3
-rw-r--r--os/strlcpy.c3
-rw-r--r--record/set.h2
-rw-r--r--render/filter.c2
-rw-r--r--render/picturestr.h2
-rw-r--r--render/renderedge.c2
-rw-r--r--render/renderedge.h2
-rwxr-xr-xxfixes/cursor.c2
-rwxr-xr-xxfixes/region.c2
-rwxr-xr-xxfixes/saveset.c2
-rwxr-xr-xxfixes/select.c2
-rwxr-xr-xxfixes/xfixes.h2
-rwxr-xr-xxfixes/xfixesint.h2
-rw-r--r--xkb/ddxFakeBtn.c1
-rw-r--r--xkb/ddxInit.c1
-rw-r--r--xkb/ddxKeyClick.c1
-rw-r--r--xkb/ddxLEDs.c1
-rw-r--r--xkb/xkbPrOtherEv.c1
-rw-r--r--xkb/xkbout.c2
-rw-r--r--xkb/xkbtext.c2
586 files changed, 3 insertions, 1031 deletions
diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c
index cd2a78d4e..2fe630193 100644
--- a/GL/glx/renderpix.c
+++ b/GL/glx/renderpix.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/renderpixswap.c b/GL/glx/renderpixswap.c
index 0a9f60f6f..8455807e6 100644
--- a/GL/glx/renderpixswap.c
+++ b/GL/glx/renderpixswap.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c
index 98898aa3a..d6b96defc 100644
--- a/GL/glx/singlepix.c
+++ b/GL/glx/singlepix.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/GL/glx/singlesize.h b/GL/glx/singlesize.h
index 5d25b24ce..1cce1bcbc 100644
--- a/GL/glx/singlesize.h
+++ b/GL/glx/singlesize.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c
index b24c77d44..9629cf147 100644
--- a/GL/glx/xfont.c
+++ b/GL/glx/xfont.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c
index dc2a3383a..86c240362 100644
--- a/XTrap/xtrapdiswp.c
+++ b/XTrap/xtrapdiswp.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991, 1992 by
diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c
index 27cfc362b..db78c26e2 100644
--- a/XTrap/xtrapditbl.c
+++ b/XTrap/xtrapditbl.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index db0348144..c54340b61 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -24,8 +24,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $
*/
/* THIS IS NOT AN X CONSORTIUM STANDARD */
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 3ad90fa84..89c754732 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -1,4 +1,3 @@
-/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index d9c569609..7508aa773 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -20,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/Xext/shmint.h b/Xext/shmint.h
index 5135d1729..fc056bc72 100644
--- a/Xext/shmint.h
+++ b/Xext/shmint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
index e273c5313..97ef3dc38 100644
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@@ -1,6 +1,4 @@
/*
- * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $
- *
* Copyright © 2003 Philip Blundell
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h
index 00af9858b..75cacddcc 100644
--- a/Xext/xvdisp.h
+++ b/Xext/xvdisp.h
@@ -1,3 +1 @@
-/* $XFree86$ */
-
extern void XineramifyXv(void);
diff --git a/afb/afbbres.c b/afb/afbbres.c
index e8f1b3b85..dae4746a0 100644
--- a/afb/afbbres.c
+++ b/afb/afbbres.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbbresd.c b/afb/afbbresd.c
index 4495c8cf8..4f07ede6c 100644
--- a/afb/afbbresd.c
+++ b/afb/afbbresd.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbbstore.c b/afb/afbbstore.c
index f7f1062e2..32d64ec47 100644
--- a/afb/afbbstore.c
+++ b/afb/afbbstore.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/*
diff --git a/afb/afbfont.c b/afb/afbfont.c
index 940bdb09b..11a449423 100644
--- a/afb/afbfont.c
+++ b/afb/afbfont.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/afb/afbmisc.c b/afb/afbmisc.c
index 023c43f34..8e9c9e8e9 100644
--- a/afb/afbmisc.c
+++ b/afb/afbmisc.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
index 94c96e4cf..6082f7caa 100644
--- a/afb/afbpntwin.c
+++ b/afb/afbpntwin.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c
index 91b61a711..c13baf143 100644
--- a/cfb/cfbcppl.c
+++ b/cfb/cfbcppl.c
@@ -1,6 +1,4 @@
/*
- * $TOG: cfb8cppl.c /main/16 1998/02/09 14:04:13 kaleb $
- *
Copyright 1990, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h
index d95efd66d..60d203f90 100644
--- a/cfb/cfbtab.h
+++ b/cfb/cfbtab.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/composite/compalloc.c b/composite/compalloc.c
index ce1ef7d80..5ea015b76 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/composite/compext.c b/composite/compext.c
index bea8bcf23..3a43be352 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -1,7 +1,4 @@
/*
- * $Id$
- *
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/composite/compinit.c b/composite/compinit.c
index 27261dcad..9c715aa95 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/composite/compint.h b/composite/compint.h
index 0bd55a9a6..2c4d5c002 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/composite/compwindow.c b/composite/compwindow.c
index fed642ec6..9114fff26 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/damageext/damageext.c b/damageext/damageext.c
index 57a7bce09..e1724ecc7 100755
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/damageext/damageext.h b/damageext/damageext.h
index fb58483a0..642800bd2 100644
--- a/damageext/damageext.h
+++ b/damageext/damageext.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/damageext/damageextint.h b/damageext/damageextint.h
index 1ed07de83..dfafc9319 100644
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
index 835074c75..90f13428a 100644
--- a/dbe/dbestruct.h
+++ b/dbe/dbestruct.h
@@ -29,7 +29,6 @@
* Header file for DIX-related DBE
*
*****************************************************************************/
-/* $XFree86$ */
#ifndef DBE_STRUCT_H
#define DBE_STRUCT_H
diff --git a/dbe/midbe.h b/dbe/midbe.h
index 1780c3fc3..007f2e37b 100644
--- a/dbe/midbe.h
+++ b/dbe/midbe.h
@@ -1,5 +1,4 @@
/******************************************************************************
- *
* Copyright (c) 1994, 1995 Hewlett-Packard Company
*
* Permission is hereby granted, free of charge, to any person obtaining
@@ -29,8 +28,6 @@
* Header file for users of machine-independent DBE code
*
*****************************************************************************/
-/* $XFree86$ */
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/dix/main.c b/dix/main.c
index 623ce9c28..7984137e2 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -74,8 +74,6 @@ Equipment Corporation.
******************************************************************/
-/* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */
-
#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/dix/resource.c b/dix/resource.c
index f4bf1fcf6..e83c529d3 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -101,8 +101,6 @@ Equipment Corporation.
* of the copyright holder.
*/
-/* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
-
/* Routines to manage various kinds of resources:
*
* CreateNewResourceType, CreateNewResourceClass, InitClientResources,
diff --git a/dix/xpstubs.c b/dix/xpstubs.c
index 3276d9dfe..59340ad21 100644
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
Copyright 1996, 1998 The Open Group
diff --git a/fb/fb24_32.h b/fb/fb24_32.h
index 3c83f3423..7c9819eba 100644
--- a/fb/fb24_32.h
+++ b/fb/fb24_32.h
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 4f807ed8d..496c2d4ce 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -1,6 +1,4 @@
/*
- * Id: fballpriv.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbarc.c b/fb/fbarc.c
index d2c1a76f1..3f46bd4b2 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -1,6 +1,4 @@
/*
- * Id: fbarc.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbbits.c b/fb/fbbits.c
index cefe943b6..808374309 100644
--- a/fb/fbbits.c
+++ b/fb/fbbits.c
@@ -1,6 +1,4 @@
/*
- * Id: fbbits.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 603c02929..44991f106 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbblt.c b/fb/fbblt.c
index e18981a83..837c3a239 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -1,6 +1,4 @@
/*
- * Id: fbblt.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index d2c180fef..ffe69775a 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -1,6 +1,4 @@
/*
- * Id: fbbltone.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbbstore.c b/fb/fbbstore.c
index 78174b6fc..3ee5f5e35 100644
--- a/fb/fbbstore.c
+++ b/fb/fbbstore.c
@@ -1,6 +1,4 @@
/*
- * Id: fbbstore.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 84053e70f..3ad01bfee 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -1,6 +1,4 @@
/*
- * Id: fbcopy.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbfill.c b/fb/fbfill.c
index 4957bed8f..831b1ce76 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -1,6 +1,4 @@
/*
- * Id: fbfill.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
index f404044c5..4e4edb3fd 100644
--- a/fb/fbfillrect.c
+++ b/fb/fbfillrect.c
@@ -1,6 +1,4 @@
/*
- * Id: fbfillrect.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
index 77e4772a6..5d2147213 100644
--- a/fb/fbfillsp.c
+++ b/fb/fbfillsp.c
@@ -1,6 +1,4 @@
/*
- * Id: fbfillsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 3f8bf25e7..fda391b14 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -1,6 +1,4 @@
/*
- * Id: fbgc.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index ffd8a1d7d..6402c6c38 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -1,6 +1,4 @@
/*
- * Id: fbgetsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 06a3c84fe..2b9ac27c0 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -1,6 +1,4 @@
/*
- * Id: fbimage.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbline.c b/fb/fbline.c
index 8e99dd99f..2cee123ae 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 18c120440..88f693e73 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -1,6 +1,4 @@
/*
- * Id: fbpixmap.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index c03ea18cc..c0ea8ba5b 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -1,6 +1,4 @@
/*
- * Id: fbpoint.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbpush.c b/fb/fbpush.c
index bb7bcefef..891572f0d 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -1,6 +1,4 @@
/*
- * Id: fbpush.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbrop.h b/fb/fbrop.h
index f3768a265..1685ee836 100644
--- a/fb/fbrop.h
+++ b/fb/fbrop.h
@@ -1,6 +1,4 @@
/*
- * Id: fbrop.h,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 31076379b..80ce7404e 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -1,6 +1,4 @@
/*
- * Id: fbseg.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index 06332568b..227ba4c62 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -1,6 +1,4 @@
/*
- * Id: fbsetsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 6b5ed0fa1..53fcae071 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbstipple.c b/fb/fbstipple.c
index de8d1f814..7d1326367 100644
--- a/fb/fbstipple.c
+++ b/fb/fbstipple.c
@@ -1,6 +1,4 @@
/*
- * Id: fbstipple.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbtile.c b/fb/fbtile.c
index a9ffa9794..05a27a17b 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -1,6 +1,4 @@
/*
- * Id: fbtile.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 831306869..e70336cce 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbutil.c b/fb/fbutil.c
index 4be0f233c..5e232971e 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -1,6 +1,4 @@
/*
- * Id: fbutil.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index fc036d3bb..144f08362 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -1,6 +1,4 @@
/*
- * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
- *
* Copyright © 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/darwin/apple/X11Application.h b/hw/darwin/apple/X11Application.h
index b9d2af8bf..6b1d72643 100644
--- a/hw/darwin/apple/X11Application.h
+++ b/hw/darwin/apple/X11Application.h
@@ -1,5 +1,4 @@
/* X11Application.h -- subclass of NSApplication to multiplex events
- $Id: X11Application.h,v 1.26 2003/08/08 19:16:13 jharper Exp $
Copyright (c) 2002-2007 Apple Inc. All rights reserved.
diff --git a/hw/darwin/apple/X11Controller.h b/hw/darwin/apple/X11Controller.h
index 954d0abb9..8d17fd9c3 100644
--- a/hw/darwin/apple/X11Controller.h
+++ b/hw/darwin/apple/X11Controller.h
@@ -1,5 +1,4 @@
/* X11Controller.h -- connect the IB ui
- $Id: X11Controller.h,v 1.21 2003/07/24 17:52:29 jharper Exp $
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index a35e1e37f..ec7820dc6 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -1,5 +1,4 @@
/* bundle-main.c -- X server launcher
- $Id: bundle-main.c,v 1.17 2003/09/11 00:17:10 jharper Exp $
Copyright (c) 2002-2007 Apple Inc. All rights reserved.
diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h
index a2622e060..2f2b22389 100644
--- a/hw/darwin/quartz/XApplication.h
+++ b/hw/darwin/quartz/XApplication.h
@@ -30,7 +30,6 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: $ */
#import <Cocoa/Cocoa.h>
diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h
index 94133e4af..d6779ae7d 100644
--- a/hw/darwin/quartz/cr/cr.h
+++ b/hw/darwin/quartz/cr/cr.h
@@ -26,7 +26,6 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
-/* $XFree86$ */
#ifndef _CR_H
#define _CR_H
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c
index 98b8b6fee..3be59df33 100644
--- a/hw/darwin/quartz/keysym2ucs.c
+++ b/hw/darwin/quartz/keysym2ucs.c
@@ -1,5 +1,4 @@
-/* $XFree86: $
- *
+/*
* This module converts keysym values into the corresponding ISO 10646
* (UCS, Unicode) values.
*
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h
index c7ff6f3b3..f5b7a18f2 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/darwin/quartz/keysym2ucs.h
@@ -1,5 +1,4 @@
-/* $XFree86: $
- *
+/*
* This module converts keysym values into the corresponding ISO 10646
* (UCS, Unicode) values.
*
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index bd2cc25ea..bdd541663 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -1,6 +1,5 @@
/*
quartzKeyboard.c
- $Id$
Code to build a keymap using the Carbon Keyboard Layout API,
which is supported on Mac OS X 10.2 and newer.
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h
index fb6842c87..a10b1b8e1 100644
--- a/hw/darwin/quartz/xpr/Xplugin.h
+++ b/hw/darwin/quartz/xpr/Xplugin.h
@@ -1,5 +1,4 @@
/* Xplugin.h -- windowing API for rootless X11 server
- $Id$
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
diff --git a/hw/darwin/quartz/xpr/appledri.h b/hw/darwin/quartz/xpr/appledri.h
index 9c630373d..c4e43be12 100644
--- a/hw/darwin/quartz/xpr/appledri.h
+++ b/hw/darwin/quartz/xpr/appledri.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.7 2000/12/07 20:26:02 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/appledristr.h b/hw/darwin/quartz/xpr/appledristr.h
index 36a2e891e..8649fd329 100644
--- a/hw/darwin/quartz/xpr/appledristr.h
+++ b/hw/darwin/quartz/xpr/appledristr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.9 2001/03/21 16:01:08 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
index 40e530fe0..6bbeacfab 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -1,5 +1,4 @@
/* x-hash.c - basic hash tables
- $Id$
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h
index 5d4f7f93a..3456dbedf 100644
--- a/hw/darwin/quartz/xpr/x-hash.h
+++ b/hw/darwin/quartz/xpr/x-hash.h
@@ -1,5 +1,4 @@
/* x-hash.h -- basic hash table class
- $Id$
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
index 7a0496763..42915db6f 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@@ -1,5 +1,4 @@
/* x-hook.c
- $Id$
Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
@@ -27,7 +26,6 @@
copyright holders shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software without
prior written authorization. */
-/* $XFree86: $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h
index 0b5e038fe..392352d50 100644
--- a/hw/darwin/quartz/xpr/x-hook.h
+++ b/hw/darwin/quartz/xpr/x-hook.h
@@ -1,5 +1,4 @@
/* x-hook.h -- lists of function,data pairs to call.
- $Id$
Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
@@ -27,7 +26,6 @@
copyright holders shall not be used in advertising or otherwise to
promote the sale, use or other dealings in this Software without
prior written authorization. */
-/* $XFree86: $ */
#ifndef X_HOOK_H
#define X_HOOK_H 1
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c
index a973e03f3..a5f835d84 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@@ -1,5 +1,4 @@
/* x-list.c
- $Id$
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h
index bd55a53d0..04af024a2 100644
--- a/hw/darwin/quartz/xpr/x-list.h
+++ b/hw/darwin/quartz/xpr/x-list.h
@@ -1,5 +1,4 @@
/* x-list.h -- simple list type
- $Id$
Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
diff --git a/hw/dmx/config/Canvas.c b/hw/dmx/config/Canvas.c
index 4dccd7382..c2eba876a 100644
--- a/hw/dmx/config/Canvas.c
+++ b/hw/dmx/config/Canvas.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 1987, 1998 The Open Group
*
diff --git a/hw/dmx/config/Canvas.h b/hw/dmx/config/Canvas.h
index a36851a6d..fe9a57f21 100644
--- a/hw/dmx/config/Canvas.h
+++ b/hw/dmx/config/Canvas.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
Copyright 1987, 1998 The Open Group
diff --git a/hw/dmx/config/CanvasP.h b/hw/dmx/config/CanvasP.h
index 98f95b94e..cf43710f1 100644
--- a/hw/dmx/config/CanvasP.h
+++ b/hw/dmx/config/CanvasP.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
Copyright 1987, 1998 The Open Group
diff --git a/hw/dmx/config/dmxcompat.c b/hw/dmx/config/dmxcompat.c
index 3681e8aa2..b4190ffcc 100644
--- a/hw/dmx/config/dmxcompat.c
+++ b/hw/dmx/config/dmxcompat.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxcompat.h b/hw/dmx/config/dmxcompat.h
index 416ec7873..718892040 100644
--- a/hw/dmx/config/dmxcompat.h
+++ b/hw/dmx/config/dmxcompat.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c
index 353ce11db..225d89277 100644
--- a/hw/dmx/config/dmxconfig.c
+++ b/hw/dmx/config/dmxconfig.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxconfig.h b/hw/dmx/config/dmxconfig.h
index b5c0c1f1c..7c9dbc799 100644
--- a/hw/dmx/config/dmxconfig.h
+++ b/hw/dmx/config/dmxconfig.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxparse.c b/hw/dmx/config/dmxparse.c
index 1acb6d13e..0bf947051 100644
--- a/hw/dmx/config/dmxparse.c
+++ b/hw/dmx/config/dmxparse.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxparse.h b/hw/dmx/config/dmxparse.h
index 8ea84f4e3..de81d23b7 100644
--- a/hw/dmx/config/dmxparse.h
+++ b/hw/dmx/config/dmxparse.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxprint.c b/hw/dmx/config/dmxprint.c
index ed3fc213d..599ebf5df 100644
--- a/hw/dmx/config/dmxprint.c
+++ b/hw/dmx/config/dmxprint.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxprint.h b/hw/dmx/config/dmxprint.h
index b68c29620..d162dea95 100644
--- a/hw/dmx/config/dmxprint.h
+++ b/hw/dmx/config/dmxprint.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/dmxtodmx.c b/hw/dmx/config/dmxtodmx.c
index 706c49908..0d4ee4c09 100644
--- a/hw/dmx/config/dmxtodmx.c
+++ b/hw/dmx/config/dmxtodmx.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/vdltodmx.c b/hw/dmx/config/vdltodmx.c
index 33cd8fe8a..69563f16c 100644
--- a/hw/dmx/config/vdltodmx.c
+++ b/hw/dmx/config/vdltodmx.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
index 9a350a826..033b52512 100644
--- a/hw/dmx/config/xdmxconfig.c
+++ b/hw/dmx/config/xdmxconfig.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
@@ -60,7 +59,7 @@
extern int yyparse(void);
extern FILE *yyin;
-#define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n$Id$"
+#define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n"
#define DMX_MAIN_WIDTH 800
#define DMX_MAIN_HEIGHT 600
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index b7c81ee57..24d1620b8 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h
index becb2da38..37f42a76f 100644
--- a/hw/dmx/dmx.h
+++ b/hw/dmx/dmx.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
index b1f47bde4..2ecfe22a3 100644
--- a/hw/dmx/dmxcb.c
+++ b/hw/dmx/dmxcb.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxcb.h b/hw/dmx/dmxcb.h
index 38ffa5671..fa334dbe8 100644
--- a/hw/dmx/dmxcb.h
+++ b/hw/dmx/dmxcb.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h
index 657a1275f..8f018d153 100644
--- a/hw/dmx/dmxclient.h
+++ b/hw/dmx/dmxclient.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright (c) 1995 X Consortium
* Copyright 2004 Red Hat Inc., Durham, North Carolina.
diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c
index 9a9781f53..949d7d689 100644
--- a/hw/dmx/dmxcmap.c
+++ b/hw/dmx/dmxcmap.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxcmap.h b/hw/dmx/dmxcmap.h
index 09039e72b..228f8662e 100644
--- a/hw/dmx/dmxcmap.h
+++ b/hw/dmx/dmxcmap.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index a7d9378b0..1ad199d58 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxcursor.h b/hw/dmx/dmxcursor.h
index af076bd1c..7b70c6250 100644
--- a/hw/dmx/dmxcursor.h
+++ b/hw/dmx/dmxcursor.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c
index 5bcce188d..5c176dfc3 100644
--- a/hw/dmx/dmxdpms.c
+++ b/hw/dmx/dmxdpms.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxdpms.h b/hw/dmx/dmxdpms.h
index d3fa57d4a..e3eee983a 100644
--- a/hw/dmx/dmxdpms.h
+++ b/hw/dmx/dmxdpms.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index c12973bd5..103364446 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxextension.h b/hw/dmx/dmxextension.h
index 3ea0b83ec..342d8c593 100644
--- a/hw/dmx/dmxextension.h
+++ b/hw/dmx/dmxextension.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index 3dba61de4..500b5682a 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxfont.h b/hw/dmx/dmxfont.h
index f69aac196..086e71b59 100644
--- a/hw/dmx/dmxfont.h
+++ b/hw/dmx/dmxfont.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c
index d17b05164..981f64d0a 100644
--- a/hw/dmx/dmxgc.c
+++ b/hw/dmx/dmxgc.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxgc.h b/hw/dmx/dmxgc.h
index 5f54d7dc9..3d49f6735 100644
--- a/hw/dmx/dmxgc.h
+++ b/hw/dmx/dmxgc.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c
index 75d9dfb73..eaabf16dd 100644
--- a/hw/dmx/dmxgcops.c
+++ b/hw/dmx/dmxgcops.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxgcops.h b/hw/dmx/dmxgcops.h
index 0754c44c1..da14d4d94 100644
--- a/hw/dmx/dmxgcops.h
+++ b/hw/dmx/dmxgcops.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 1d3689c40..29dc00575 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxinit.h b/hw/dmx/dmxinit.h
index e5bdb9957..7d166fd85 100644
--- a/hw/dmx/dmxinit.h
+++ b/hw/dmx/dmxinit.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2004 Red Hat Inc., Raleigh, North Carolina.
*
diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c
index f47899c2f..d644b5d0d 100644
--- a/hw/dmx/dmxinput.c
+++ b/hw/dmx/dmxinput.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxinput.h b/hw/dmx/dmxinput.h
index 3fb587086..8a3ccdcbd 100644
--- a/hw/dmx/dmxinput.h
+++ b/hw/dmx/dmxinput.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
index 16d082daa..31a74cdf1 100644
--- a/hw/dmx/dmxlog.c
+++ b/hw/dmx/dmxlog.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h
index 6b9ec6005..8a5f725c8 100644
--- a/hw/dmx/dmxlog.h
+++ b/hw/dmx/dmxlog.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 0f1782e51..478542a13 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxpict.h b/hw/dmx/dmxpict.h
index fe2a65959..c178ef39c 100644
--- a/hw/dmx/dmxpict.h
+++ b/hw/dmx/dmxpict.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c
index 934060675..40d2d8e56 100644
--- a/hw/dmx/dmxpixmap.c
+++ b/hw/dmx/dmxpixmap.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxpixmap.h b/hw/dmx/dmxpixmap.h
index 908d2cb2c..4ecd10fd8 100644
--- a/hw/dmx/dmxpixmap.h
+++ b/hw/dmx/dmxpixmap.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxprop.c b/hw/dmx/dmxprop.c
index 8d9e22a27..376313d8d 100644
--- a/hw/dmx/dmxprop.c
+++ b/hw/dmx/dmxprop.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxprop.h b/hw/dmx/dmxprop.h
index f0c5afb95..50135cd64 100644
--- a/hw/dmx/dmxprop.h
+++ b/hw/dmx/dmxprop.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 7c315d89f..8ae448a5e 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxscrinit.h b/hw/dmx/dmxscrinit.h
index 91be0948c..46a0a00a4 100644
--- a/hw/dmx/dmxscrinit.h
+++ b/hw/dmx/dmxscrinit.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxshadow.c b/hw/dmx/dmxshadow.c
index 8d1e147d1..461fd085b 100644
--- a/hw/dmx/dmxshadow.c
+++ b/hw/dmx/dmxshadow.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxshadow.h b/hw/dmx/dmxshadow.h
index 4ba084c99..cafe87900 100644
--- a/hw/dmx/dmxshadow.h
+++ b/hw/dmx/dmxshadow.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c
index 3b092b2a8..a89c69eae 100644
--- a/hw/dmx/dmxstat.c
+++ b/hw/dmx/dmxstat.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002, 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxstat.h b/hw/dmx/dmxstat.h
index 5411272ca..04c88d3c9 100644
--- a/hw/dmx/dmxstat.h
+++ b/hw/dmx/dmxstat.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c
index 02e244697..c1aa43107 100644
--- a/hw/dmx/dmxsync.c
+++ b/hw/dmx/dmxsync.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxsync.h b/hw/dmx/dmxsync.h
index 85fd36c07..b80f54af2 100644
--- a/hw/dmx/dmxsync.h
+++ b/hw/dmx/dmxsync.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxvisual.c b/hw/dmx/dmxvisual.c
index 23ff0acfa..7b8771f9e 100644
--- a/hw/dmx/dmxvisual.c
+++ b/hw/dmx/dmxvisual.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxvisual.h b/hw/dmx/dmxvisual.h
index 8701bf01f..bcb54cd0e 100644
--- a/hw/dmx/dmxvisual.h
+++ b/hw/dmx/dmxvisual.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 25456e228..b66f2a3bb 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/dmxwindow.h b/hw/dmx/dmxwindow.h
index e6302fe3f..f976c7954 100644
--- a/hw/dmx/dmxwindow.h
+++ b/hw/dmx/dmxwindow.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxaddinput.c b/hw/dmx/examples/dmxaddinput.c
index c391385e9..dcfd4f5cc 100644
--- a/hw/dmx/examples/dmxaddinput.c
+++ b/hw/dmx/examples/dmxaddinput.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003,2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxaddscreen.c b/hw/dmx/examples/dmxaddscreen.c
index 5fa008c21..8e60872df 100644
--- a/hw/dmx/examples/dmxaddscreen.c
+++ b/hw/dmx/examples/dmxaddscreen.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxreconfig.c b/hw/dmx/examples/dmxreconfig.c
index efcead86e..042f8a112 100644
--- a/hw/dmx/examples/dmxreconfig.c
+++ b/hw/dmx/examples/dmxreconfig.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxresize.c b/hw/dmx/examples/dmxresize.c
index f6fadf70c..caed91d8d 100644
--- a/hw/dmx/examples/dmxresize.c
+++ b/hw/dmx/examples/dmxresize.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxrminput.c b/hw/dmx/examples/dmxrminput.c
index 3860cc9c6..ef62cab8b 100644
--- a/hw/dmx/examples/dmxrminput.c
+++ b/hw/dmx/examples/dmxrminput.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003,2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxrmscreen.c b/hw/dmx/examples/dmxrmscreen.c
index ab3653d24..fecf0f6c1 100644
--- a/hw/dmx/examples/dmxrmscreen.c
+++ b/hw/dmx/examples/dmxrmscreen.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/dmxwininfo.c b/hw/dmx/examples/dmxwininfo.c
index bbf7f7446..6cf1d411e 100644
--- a/hw/dmx/examples/dmxwininfo.c
+++ b/hw/dmx/examples/dmxwininfo.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright (c) 2003 by the XFree86 Project, Inc.
*
diff --git a/hw/dmx/examples/ev.c b/hw/dmx/examples/ev.c
index 04c47eb11..10912266d 100644
--- a/hw/dmx/examples/ev.c
+++ b/hw/dmx/examples/ev.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/evi.c b/hw/dmx/examples/evi.c
index 14af95d5a..644ea8f51 100644
--- a/hw/dmx/examples/evi.c
+++ b/hw/dmx/examples/evi.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/res.c b/hw/dmx/examples/res.c
index 3af5541fa..901a1958b 100644
--- a/hw/dmx/examples/res.c
+++ b/hw/dmx/examples/res.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/xbell.c b/hw/dmx/examples/xbell.c
index 4d55740a8..f3e3be1b8 100644
--- a/hw/dmx/examples/xbell.c
+++ b/hw/dmx/examples/xbell.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/xdmx.c b/hw/dmx/examples/xdmx.c
index 3fec7dd3d..dedce6e8d 100644
--- a/hw/dmx/examples/xdmx.c
+++ b/hw/dmx/examples/xdmx.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c
index c2b9bc0f4..74353a93b 100644
--- a/hw/dmx/examples/xinput.c
+++ b/hw/dmx/examples/xinput.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001,2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/xled.c b/hw/dmx/examples/xled.c
index cb4bcb1ac..270f80511 100644
--- a/hw/dmx/examples/xled.c
+++ b/hw/dmx/examples/xled.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/examples/xtest.c b/hw/dmx/examples/xtest.c
index b6f223d27..1e2d1cfff 100644
--- a/hw/dmx/examples/xtest.c
+++ b/hw/dmx/examples/xtest.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/glxProxy/glxswap.c b/hw/dmx/glxProxy/glxswap.c
index f7fcc37ac..8fa04f877 100644
--- a/hw/dmx/glxProxy/glxswap.c
+++ b/hw/dmx/glxProxy/glxswap.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Raleigh, North Carolina.
*
diff --git a/hw/dmx/glxProxy/glxswap.h b/hw/dmx/glxProxy/glxswap.h
index 95c433381..08e38df7b 100644
--- a/hw/dmx/glxProxy/glxswap.h
+++ b/hw/dmx/glxProxy/glxswap.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Raleigh, North Carolina.
*
diff --git a/hw/dmx/input/ChkNotMaskEv.c b/hw/dmx/input/ChkNotMaskEv.c
index 220e1de39..fdc67a889 100644
--- a/hw/dmx/input/ChkNotMaskEv.c
+++ b/hw/dmx/input/ChkNotMaskEv.c
@@ -1,4 +1,3 @@
-/* Derived from Xorg: ChkMaskEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp */
/*
* Copyright 1985, 1987, 1998 The Open Group
*
diff --git a/hw/dmx/input/ChkNotMaskEv.h b/hw/dmx/input/ChkNotMaskEv.h
index 777d3a28a..f79075e1d 100644
--- a/hw/dmx/input/ChkNotMaskEv.h
+++ b/hw/dmx/input/ChkNotMaskEv.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxarg.c b/hw/dmx/input/dmxarg.c
index 8708fa009..49a1da9af 100644
--- a/hw/dmx/input/dmxarg.c
+++ b/hw/dmx/input/dmxarg.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxarg.h b/hw/dmx/input/dmxarg.h
index b377aca70..ca76f9272 100644
--- a/hw/dmx/input/dmxarg.h
+++ b/hw/dmx/input/dmxarg.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index 7aa8510cb..b1791098a 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxbackend.h b/hw/dmx/input/dmxbackend.h
index 64a65f4a6..ee78f0014 100644
--- a/hw/dmx/input/dmxbackend.h
+++ b/hw/dmx/input/dmxbackend.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c
index 1dcc1e9e4..e77bb7918 100644
--- a/hw/dmx/input/dmxcommon.c
+++ b/hw/dmx/input/dmxcommon.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxcommon.h b/hw/dmx/input/dmxcommon.h
index 4b8b07d9f..1cc935d0b 100644
--- a/hw/dmx/input/dmxcommon.h
+++ b/hw/dmx/input/dmxcommon.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002,2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index aac5e08dc..cc820a204 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxconsole.h b/hw/dmx/input/dmxconsole.h
index 85516fb5b..cd545d39b 100644
--- a/hw/dmx/input/dmxconsole.h
+++ b/hw/dmx/input/dmxconsole.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxdetach.c b/hw/dmx/input/dmxdetach.c
index d2e6b652f..cc2250683 100644
--- a/hw/dmx/input/dmxdetach.c
+++ b/hw/dmx/input/dmxdetach.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2004 Red Hat Inc., Raleigh, North Carolina.
*
diff --git a/hw/dmx/input/dmxdummy.c b/hw/dmx/input/dmxdummy.c
index b9c72b015..2afe2580d 100644
--- a/hw/dmx/input/dmxdummy.c
+++ b/hw/dmx/input/dmxdummy.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxdummy.h b/hw/dmx/input/dmxdummy.h
index 1f20a38cb..e3a85be95 100644
--- a/hw/dmx/input/dmxdummy.h
+++ b/hw/dmx/input/dmxdummy.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c
index a2fb07f1e..3e98fb799 100644
--- a/hw/dmx/input/dmxeq.c
+++ b/hw/dmx/input/dmxeq.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
*
* Copyright 1990, 1998 The Open Group
diff --git a/hw/dmx/input/dmxeq.h b/hw/dmx/input/dmxeq.h
index 64d15f7e8..b38c519df 100644
--- a/hw/dmx/input/dmxeq.h
+++ b/hw/dmx/input/dmxeq.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 4810b17bb..26dc067dc 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxevents.h b/hw/dmx/input/dmxevents.h
index f8d29d440..fe8712ebe 100644
--- a/hw/dmx/input/dmxevents.h
+++ b/hw/dmx/input/dmxevents.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index a9d902ec2..fd4eeaacb 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h
index c593e267a..6f491edf9 100644
--- a/hw/dmx/input/dmxinputinit.h
+++ b/hw/dmx/input/dmxinputinit.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxmap.c b/hw/dmx/input/dmxmap.c
index cf1be5853..1eccd3d28 100644
--- a/hw/dmx/input/dmxmap.c
+++ b/hw/dmx/input/dmxmap.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxmap.h b/hw/dmx/input/dmxmap.h
index 662955636..aad30d1bd 100644
--- a/hw/dmx/input/dmxmap.h
+++ b/hw/dmx/input/dmxmap.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxmotion.c b/hw/dmx/input/dmxmotion.c
index 7b47c4562..cc55eedff 100644
--- a/hw/dmx/input/dmxmotion.c
+++ b/hw/dmx/input/dmxmotion.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxmotion.h b/hw/dmx/input/dmxmotion.h
index 2928f5f2a..88aeb3d09 100644
--- a/hw/dmx/input/dmxmotion.h
+++ b/hw/dmx/input/dmxmotion.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxsigio.c b/hw/dmx/input/dmxsigio.c
index 840b56641..03c3070d7 100644
--- a/hw/dmx/input/dmxsigio.c
+++ b/hw/dmx/input/dmxsigio.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxsigio.h b/hw/dmx/input/dmxsigio.h
index 869dd6bdf..83f8060ae 100644
--- a/hw/dmx/input/dmxsigio.h
+++ b/hw/dmx/input/dmxsigio.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c
index ad2a77c9c..97bea7596 100644
--- a/hw/dmx/input/dmxxinput.c
+++ b/hw/dmx/input/dmxxinput.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c
index b09492b89..42a807b11 100644
--- a/hw/dmx/input/lnx-keyboard.c
+++ b/hw/dmx/input/lnx-keyboard.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Portions of this file were derived from the following files:
*
**********************************************************************
diff --git a/hw/dmx/input/lnx-keyboard.h b/hw/dmx/input/lnx-keyboard.h
index 8f7129048..e36a50499 100644
--- a/hw/dmx/input/lnx-keyboard.h
+++ b/hw/dmx/input/lnx-keyboard.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c
index 6df4e80d3..b3692a071 100644
--- a/hw/dmx/input/lnx-ms.c
+++ b/hw/dmx/input/lnx-ms.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Portions of this file were derived from the following files:
*
**********************************************************************
diff --git a/hw/dmx/input/lnx-ms.h b/hw/dmx/input/lnx-ms.h
index bc744431a..9042fc293 100644
--- a/hw/dmx/input/lnx-ms.h
+++ b/hw/dmx/input/lnx-ms.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c
index 0c5b870aa..8b906df5f 100644
--- a/hw/dmx/input/lnx-ps2.c
+++ b/hw/dmx/input/lnx-ps2.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Portions of this file were derived from the following files:
*
**********************************************************************
diff --git a/hw/dmx/input/lnx-ps2.h b/hw/dmx/input/lnx-ps2.h
index e3d751e2f..5772e03d0 100644
--- a/hw/dmx/input/lnx-ps2.h
+++ b/hw/dmx/input/lnx-ps2.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c
index a6fe7ad3b..70695d0f1 100644
--- a/hw/dmx/input/usb-common.c
+++ b/hw/dmx/input/usb-common.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-common.h b/hw/dmx/input/usb-common.h
index 768312990..5ebfd1e78 100644
--- a/hw/dmx/input/usb-common.h
+++ b/hw/dmx/input/usb-common.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c
index 4b9439603..efec2705b 100644
--- a/hw/dmx/input/usb-keyboard.c
+++ b/hw/dmx/input/usb-keyboard.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* Portions of this file were derived from the following files:
*
**********************************************************************
diff --git a/hw/dmx/input/usb-keyboard.h b/hw/dmx/input/usb-keyboard.h
index 5a4768a9d..1f9614eef 100644
--- a/hw/dmx/input/usb-keyboard.h
+++ b/hw/dmx/input/usb-keyboard.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-mouse.c b/hw/dmx/input/usb-mouse.c
index eb1a3d123..efa9d00ec 100644
--- a/hw/dmx/input/usb-mouse.c
+++ b/hw/dmx/input/usb-mouse.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-mouse.h b/hw/dmx/input/usb-mouse.h
index 2439013ee..918bf6481 100644
--- a/hw/dmx/input/usb-mouse.h
+++ b/hw/dmx/input/usb-mouse.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-other.c b/hw/dmx/input/usb-other.c
index 9bb284281..d1074b8e1 100644
--- a/hw/dmx/input/usb-other.c
+++ b/hw/dmx/input/usb-other.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-other.h b/hw/dmx/input/usb-other.h
index b2279fd8d..b69e65933 100644
--- a/hw/dmx/input/usb-other.h
+++ b/hw/dmx/input/usb-other.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h
index eae9c8b7a..c70668ce5 100644
--- a/hw/dmx/input/usb-private.h
+++ b/hw/dmx/input/usb-private.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002 Red Hat Inc., Durham, North Carolina.
*
diff --git a/hw/kdrive/ati/ati.c b/hw/kdrive/ati/ati.c
index 5b4e80ff2..c4f67e171 100644
--- a/hw/kdrive/ati/ati.c
+++ b/hw/kdrive/ati/ati.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h
index 188d0b057..3ff3e3ff3 100644
--- a/hw/kdrive/ati/ati.h
+++ b/hw/kdrive/ati/ati.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _ATI_H_
#define _ATI_H_
diff --git a/hw/kdrive/ati/ati_cursor.c b/hw/kdrive/ati/ati_cursor.c
index e8c711707..d2ce686df 100644
--- a/hw/kdrive/ati/ati_cursor.c
+++ b/hw/kdrive/ati/ati_cursor.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/ati/ati_dma.c b/hw/kdrive/ati/ati_dma.c
index 2caabdbd8..b97d79b25 100644
--- a/hw/kdrive/ati/ati_dma.c
+++ b/hw/kdrive/ati/ati_dma.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#include <sys/time.h>
diff --git a/hw/kdrive/ati/ati_dma.h b/hw/kdrive/ati/ati_dma.h
index ad2f3e12a..4c2092b2c 100644
--- a/hw/kdrive/ati/ati_dma.h
+++ b/hw/kdrive/ati/ati_dma.h
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _ATI_DMA_H_
#define _ATI_DMA_H_
diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c
index f71dac5f7..c10fea471 100644
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/ati/ati_draw.h b/hw/kdrive/ati/ati_draw.h
index addaa0ee0..98a130a7b 100644
--- a/hw/kdrive/ati/ati_draw.h
+++ b/hw/kdrive/ati/ati_draw.h
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _ATI_DRAW_H_
#define _ATI_DRAW_H_
diff --git a/hw/kdrive/ati/ati_drawtmp.h b/hw/kdrive/ati/ati_drawtmp.h
index a0057222f..82c99ac4d 100644
--- a/hw/kdrive/ati/ati_drawtmp.h
+++ b/hw/kdrive/ati/ati_drawtmp.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef USE_DMA
#define TAG(x) x##DMA
diff --git a/hw/kdrive/ati/ati_dri.c b/hw/kdrive/ati/ati_dri.c
index f2830e13a..edef72030 100644
--- a/hw/kdrive/ati/ati_dri.c
+++ b/hw/kdrive/ati/ati_dri.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#include <sys/time.h>
diff --git a/hw/kdrive/ati/ati_dri.h b/hw/kdrive/ati/ati_dri.h
index 2e2b9501b..985f7eb43 100644
--- a/hw/kdrive/ati/ati_dri.h
+++ b/hw/kdrive/ati/ati_dri.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _ATI_DRI_H_
#define _ATI_DRI_H_
diff --git a/hw/kdrive/ati/ati_reg.h b/hw/kdrive/ati/ati_reg.h
index 32291d8f4..3089cba04 100644
--- a/hw/kdrive/ati/ati_reg.h
+++ b/hw/kdrive/ati/ati_reg.h
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
/* Many of the Radeon and Rage 128 registers are the same.
* ATI_ should denote registers and values that are common for R128 and Radeon.
diff --git a/hw/kdrive/ati/ati_sarea.h b/hw/kdrive/ati/ati_sarea.h
index 67da24aca..2f04c7be0 100644
--- a/hw/kdrive/ati/ati_sarea.h
+++ b/hw/kdrive/ati/ati_sarea.h
@@ -1,7 +1,4 @@
-
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _ATI_SAREA_H_
#define _ATI_SAREA_H_
diff --git a/hw/kdrive/ati/ati_stub.c b/hw/kdrive/ati/ati_stub.c
index d0bc4ca6b..3669fd743 100644
--- a/hw/kdrive/ati/ati_stub.c
+++ b/hw/kdrive/ati/ati_stub.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/ati/ati_video.c b/hw/kdrive/ati/ati_video.c
index 173fb644f..ca0ab464a 100644
--- a/hw/kdrive/ati/ati_video.c
+++ b/hw/kdrive/ati/ati_video.c
@@ -22,7 +22,6 @@
*
* Based on mach64video.c by Keith Packard.
*/
-/* $RCSId$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/ati/r128_blendtmp.h b/hw/kdrive/ati/r128_blendtmp.h
index d31cdb3ad..b663eac95 100644
--- a/hw/kdrive/ati/r128_blendtmp.h
+++ b/hw/kdrive/ati/r128_blendtmp.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt, Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef USE_DMA
#define TAG(x) x##DMA
diff --git a/hw/kdrive/ati/r128_composite.c b/hw/kdrive/ati/r128_composite.c
index 46d4edb72..0d18ebff7 100644
--- a/hw/kdrive/ati/r128_composite.c
+++ b/hw/kdrive/ati/r128_composite.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#include "ati.h"
#include "ati_reg.h"
diff --git a/hw/kdrive/ati/radeon_composite.c b/hw/kdrive/ati/radeon_composite.c
index 18ada4f61..ddad343e3 100644
--- a/hw/kdrive/ati/radeon_composite.c
+++ b/hw/kdrive/ati/radeon_composite.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/chips/chips.c b/hw/kdrive/chips/chips.c
index 10bd24cf3..b419863eb 100644
--- a/hw/kdrive/chips/chips.c
+++ b/hw/kdrive/chips/chips.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/chips/chips.h b/hw/kdrive/chips/chips.h
index f7b9784c6..6ad17fe25 100644
--- a/hw/kdrive/chips/chips.h
+++ b/hw/kdrive/chips/chips.h
@@ -1,6 +1,4 @@
/*
- * Id: chips.h,v 1.2 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chips.h,v 1.9 2000/11/29 08:42:25 keithp Exp $ */
#ifndef _CHIPS_H_
#define _CHIPS_H_
diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c
index 7b1b56053..b1c35f901 100644
--- a/hw/kdrive/chips/chipsdraw.c
+++ b/hw/kdrive/chips/chipsdraw.c
@@ -1,6 +1,4 @@
/*
- * Id: tridentdraw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c
index 7fec1c77d..9024a7d44 100644
--- a/hw/kdrive/chips/chipsstub.c
+++ b/hw/kdrive/chips/chipsstub.c
@@ -1,6 +1,4 @@
/*
- * Id: chipsstub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/epson/epson13806.c b/hw/kdrive/epson/epson13806.c
index 43a9b58da..cb00890a7 100644
--- a/hw/kdrive/epson/epson13806.c
+++ b/hw/kdrive/epson/epson13806.c
@@ -1,4 +1,3 @@
-/* $Header$ */
/*
* Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095
*
diff --git a/hw/kdrive/epson/epson13806.h b/hw/kdrive/epson/epson13806.h
index b80fe19a4..b28d7c085 100644
--- a/hw/kdrive/epson/epson13806.h
+++ b/hw/kdrive/epson/epson13806.h
@@ -1,4 +1,3 @@
-/* $Header$ */
/*
* Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095
*
diff --git a/hw/kdrive/epson/epson13806draw.c b/hw/kdrive/epson/epson13806draw.c
index e16e0d6a2..3222353a3 100644
--- a/hw/kdrive/epson/epson13806draw.c
+++ b/hw/kdrive/epson/epson13806draw.c
@@ -1,4 +1,3 @@
-/* $Header$ */
/*
* Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095
*
diff --git a/hw/kdrive/epson/epson13806draw.h b/hw/kdrive/epson/epson13806draw.h
index ff1264d96..b5f1bf5c2 100644
--- a/hw/kdrive/epson/epson13806draw.h
+++ b/hw/kdrive/epson/epson13806draw.h
@@ -1,4 +1,3 @@
-/* $Header$ */
/*
* Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095
*
diff --git a/hw/kdrive/epson/epson13806reg.h b/hw/kdrive/epson/epson13806reg.h
index 615638210..ee745a08f 100644
--- a/hw/kdrive/epson/epson13806reg.h
+++ b/hw/kdrive/epson/epson13806reg.h
@@ -1,4 +1,3 @@
-/* $Header$ */
/*
* Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095
*
diff --git a/hw/kdrive/epson/epson13806stub.c b/hw/kdrive/epson/epson13806stub.c
index 7981782ed..087a30fc7 100644
--- a/hw/kdrive/epson/epson13806stub.c
+++ b/hw/kdrive/epson/epson13806stub.c
@@ -1,4 +1,3 @@
-/* $Header$ */
/*
* Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095
*
diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c
index ca515f9b6..6211ab871 100644
--- a/hw/kdrive/fake/fake.c
+++ b/hw/kdrive/fake/fake.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/fake/fake.h b/hw/kdrive/fake/fake.h
index f7c8c3431..88d209674 100644
--- a/hw/kdrive/fake/fake.h
+++ b/hw/kdrive/fake/fake.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c
index dd88bc5a7..2cfcbedd5 100644
--- a/hw/kdrive/fake/fakeinit.c
+++ b/hw/kdrive/fake/fakeinit.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/fake/kbd.c b/hw/kdrive/fake/kbd.c
index db224c995..83c1b3b20 100644
--- a/hw/kdrive/fake/kbd.c
+++ b/hw/kdrive/fake/kbd.c
@@ -1,6 +1,4 @@
/*
- * Id: kbd.c,v 1.1 1999/11/02 18:39:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/fake/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/fake/mouse.c b/hw/kdrive/fake/mouse.c
index beb6ff524..4b8d2b06d 100644
--- a/hw/kdrive/fake/mouse.c
+++ b/hw/kdrive/fake/mouse.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/fake/os.c b/hw/kdrive/fake/os.c
index 32cb139c0..76cd9e728 100644
--- a/hw/kdrive/fake/os.c
+++ b/hw/kdrive/fake/os.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index 598d0ceaf..6e8b3ff5e 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -1,6 +1,4 @@
/*
- * Id: fbdev.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h
index b7951db72..9e322dacb 100644
--- a/hw/kdrive/fbdev/fbdev.h
+++ b/hw/kdrive/fbdev/fbdev.h
@@ -1,6 +1,4 @@
/*
- * Id: fbdev.h,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.11 2001/06/03 21:52:45 keithp Exp $ */
#ifndef _FBDEV_H_
#define _FBDEV_H_
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 3b78c9735..5e1c88b2c 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -1,6 +1,4 @@
/*
- * Id: fbinit.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c
index d2318d786..49090f9eb 100644
--- a/hw/kdrive/i810/i810.c
+++ b/hw/kdrive/i810/i810.c
@@ -31,9 +31,6 @@ of the copyright holder.
X Window System is a trademark of The Open Group */
-
-/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810.c,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
-
/*
* i810.c - KDrive driver for the i810 chipset
*
diff --git a/hw/kdrive/i810/i810.h b/hw/kdrive/i810/i810.h
index e0f6f8173..8fc2d56be 100644
--- a/hw/kdrive/i810/i810.h
+++ b/hw/kdrive/i810/i810.h
@@ -31,8 +31,6 @@ of the copyright holder.
X Window System is a trademark of The Open Group */
-/* $RCSId: $ */
-
/*
* Author:
* Pontus Lidman <pontus.lidman@nokia.com>
diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c
index cf4f717f2..434fc4087 100644
--- a/hw/kdrive/i810/i810_cursor.c
+++ b/hw/kdrive/i810/i810_cursor.c
@@ -58,10 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-
-
-/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */
-
/* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */
/*
diff --git a/hw/kdrive/i810/i810_reg.h b/hw/kdrive/i810/i810_reg.h
index e6648a1de..d9f4c8f48 100644
--- a/hw/kdrive/i810/i810_reg.h
+++ b/hw/kdrive/i810/i810_reg.h
@@ -57,7 +57,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
/*
* Authors:
diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c
index 364d16bfe..3109984e0 100644
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@@ -1,4 +1,3 @@
-/* $RCSId: $ */
/* COPYRIGHT AND PERMISSION NOTICE
Copyright (c) 2000, 2001 Nokia Home Communications
diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c
index a0b139a30..1c446f782 100644
--- a/hw/kdrive/igs/igs.c
+++ b/hw/kdrive/igs/igs.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.2 2000/05/24 23:52:47 keithp Exp $
- *
* Copyright © 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igs.h b/hw/kdrive/igs/igs.h
index 264425022..9f0336b7d 100644
--- a/hw/kdrive/igs/igs.h
+++ b/hw/kdrive/igs/igs.h
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igs.h,v 1.1 2000/05/06 22:17:43 keithp Exp $
- *
* Copyright © 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igscmap.c b/hw/kdrive/igs/igscmap.c
index 06ab7a490..dff028e7d 100644
--- a/hw/kdrive/igs/igscmap.c
+++ b/hw/kdrive/igs/igscmap.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igscurs.c b/hw/kdrive/igs/igscurs.c
index 6d6267666..b8bd50956 100644
--- a/hw/kdrive/igs/igscurs.c
+++ b/hw/kdrive/igs/igscurs.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c
index 1ae11a571..d2ae098a6 100644
--- a/hw/kdrive/igs/igsdraw.c
+++ b/hw/kdrive/igs/igsdraw.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsdraw.c,v 1.1 2000/05/06 22:17:43 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igsdraw.h b/hw/kdrive/igs/igsdraw.h
index c969826b1..ab80f9acd 100644
--- a/hw/kdrive/igs/igsdraw.h
+++ b/hw/kdrive/igs/igsdraw.h
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsdraw.h,v 1.1 2000/05/06 22:17:43 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igsreg.c b/hw/kdrive/igs/igsreg.c
index 831d985bd..6d6f28b73 100644
--- a/hw/kdrive/igs/igsreg.c
+++ b/hw/kdrive/igs/igsreg.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igsreg.h b/hw/kdrive/igs/igsreg.h
index ddccd8907..2230ff01b 100644
--- a/hw/kdrive/igs/igsreg.h
+++ b/hw/kdrive/igs/igsreg.h
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c
index 39c6fd4ed..1c588271c 100644
--- a/hw/kdrive/igs/igsstub.c
+++ b/hw/kdrive/igs/igsstub.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsstub.c,v 1.2 2000/05/24 23:52:48 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c
index f1432a605..057b799f4 100644
--- a/hw/kdrive/ipaq/ipaq.c
+++ b/hw/kdrive/ipaq/ipaq.c
@@ -22,7 +22,6 @@
* Adapted from ts300.c by Alan Hourihane <alanh@fairlite.demon.co.uk>
* For the Compaq IPAQ handheld, with the HP VGA Out Card (F1252A).
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c
index 0524b98d1..47cc05041 100644
--- a/hw/kdrive/itsy/itsy.c
+++ b/hw/kdrive/itsy/itsy.c
@@ -1,6 +1,4 @@
/*
- * Id: itsy.c,v 1.1 1999/11/02 18:39:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/itsy/itsy.h b/hw/kdrive/itsy/itsy.h
index 3c1fdd79e..fc8fb8f4f 100644
--- a/hw/kdrive/itsy/itsy.h
+++ b/hw/kdrive/itsy/itsy.h
@@ -1,6 +1,4 @@
/*
- * Id: itsy.h,v 1.1 1999/11/02 18:39:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.h,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */
#include "kdrive.h"
#include <stdio.h>
diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c
index beb4685d4..83ed49e72 100644
--- a/hw/kdrive/itsy/kbd.c
+++ b/hw/kdrive/itsy/kbd.c
@@ -1,6 +1,4 @@
/*
- * Id: kbd.c,v 1.1 1999/11/02 18:39:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c
index 180d1fd12..34ff6a880 100644
--- a/hw/kdrive/itsy/ts.c
+++ b/hw/kdrive/itsy/ts.c
@@ -1,6 +1,4 @@
/*
- * Id: ts.c,v 1.1 1999/11/02 18:39:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index 4fb0cb3f9..80fb7259b 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -35,8 +35,6 @@ of the copyright holder.
*/
-/* $RCSId: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.4 2000/08/28 18:12:56 dawes Exp $ */
-
/*
* Author: Pontus Lidman <pontus.lidman@nokia.com> (adaption to KDrive) and others
*/
diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c
index 8cf5f901f..2d7a15751 100644
--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/linux/bus.c,v 1.2 2001/06/29 14:00:41 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
index deefcf9f4..79527c70d 100644
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c
index ad9907a59..3193ab761 100644
--- a/hw/kdrive/linux/keyboard.c
+++ b/hw/kdrive/linux/keyboard.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.10 2001/11/08 10:26:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
* XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <tf@o-hand.com>
*
diff --git a/hw/kdrive/linux/klinux.h b/hw/kdrive/linux/klinux.h
index 29ebe3aa9..349685241 100644
--- a/hw/kdrive/linux/klinux.h
+++ b/hw/kdrive/linux/klinux.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index c1fe185bd..0e4a77cdf 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/linux/linux.c,v 1.6 2001/07/24 21:26:17 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 77ec3b37b..1965342b8 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/linux/mouse.c,v 1.6 2002/08/02 16:11:35 keithp Exp $
- *
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c
index e62cebc39..d0b47a3ee 100644
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@@ -20,7 +20,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index 5d523a210..d361e82a1 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/linux/ps2.c,v 1.6 2001/10/12 06:33:10 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c
index 701fdc891..831953f02 100644
--- a/hw/kdrive/linux/ts.c
+++ b/hw/kdrive/linux/ts.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.9 2002/08/15 18:07:48 keithp Exp $
- *
* Derived from ps2.c by Jim Gettys
*
* Copyright © 1999 Keith Packard
diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c
index 1d4186d34..3c513ba17 100644
--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/mach64/mach64.h b/hw/kdrive/mach64/mach64.h
index 5757cf72d..fbb10b2ba 100644
--- a/hw/kdrive/mach64/mach64.h
+++ b/hw/kdrive/mach64/mach64.h
@@ -1,6 +1,4 @@
/*
- * Id: mach64.h,v 1.2 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.h,v 1.5 2001/06/23 03:41:24 keithp Exp $ */
#ifndef _MACH64_H_
#define _MACH64_H_
diff --git a/hw/kdrive/mach64/mach64curs.c b/hw/kdrive/mach64/mach64curs.c
index 9ac1efd53..4a5938162 100644
--- a/hw/kdrive/mach64/mach64curs.c
+++ b/hw/kdrive/mach64/mach64curs.c
@@ -1,6 +1,4 @@
/*
- * Id: tridentcurs.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c
index f91798436..15d4d417a 100644
--- a/hw/kdrive/mach64/mach64draw.c
+++ b/hw/kdrive/mach64/mach64draw.c
@@ -1,6 +1,4 @@
/*
- * Id: mach64draw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/mach64/mach64draw.h b/hw/kdrive/mach64/mach64draw.h
index b7053ae49..bac11c2a6 100644
--- a/hw/kdrive/mach64/mach64draw.h
+++ b/hw/kdrive/mach64/mach64draw.h
@@ -1,6 +1,4 @@
/*
- * Id: tridentdraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.4 2000/10/11 06:04:40 keithp Exp $ */
#ifndef _TRIDENTDRAW_H_
#define _TRIDENTDRAW_H_
diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c
index f3fef3c12..5895a3cb7 100644
--- a/hw/kdrive/mach64/mach64stub.c
+++ b/hw/kdrive/mach64/mach64stub.c
@@ -1,6 +1,4 @@
/*
- * Id: mach64stub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c
index 7d42807da..38fcef7eb 100644
--- a/hw/kdrive/mach64/mach64video.c
+++ b/hw/kdrive/mach64/mach64video.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/mga/g400_common.h b/hw/kdrive/mga/g400_common.h
index c4093d908..9f16d2431 100644
--- a/hw/kdrive/mga/g400_common.h
+++ b/hw/kdrive/mga/g400_common.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Damien Ciabrini
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef __G400_COMMON_H__
#define __G400_COMMON_H__
diff --git a/hw/kdrive/mga/g400_composite.c b/hw/kdrive/mga/g400_composite.c
index da2e8b810..dda9d9347 100644
--- a/hw/kdrive/mga/g400_composite.c
+++ b/hw/kdrive/mga/g400_composite.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Damien Ciabrini
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/mga/mga.c b/hw/kdrive/mga/mga.c
index 990d646ac..2ae35d143 100644
--- a/hw/kdrive/mga/mga.c
+++ b/hw/kdrive/mga/mga.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/mga/mga.h b/hw/kdrive/mga/mga.h
index 2c6b809c1..8fa956096 100644
--- a/hw/kdrive/mga/mga.h
+++ b/hw/kdrive/mga/mga.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003-2004 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _MGA_H_
#define _MGA_H_
diff --git a/hw/kdrive/mga/mgadraw.c b/hw/kdrive/mga/mgadraw.c
index 71d506ceb..d27e8c9cc 100644
--- a/hw/kdrive/mga/mgadraw.c
+++ b/hw/kdrive/mga/mgadraw.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003-2004 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/mga/mgastub.c b/hw/kdrive/mga/mgastub.c
index 5afbf7fcc..61e6963b8 100644
--- a/hw/kdrive/mga/mgastub.c
+++ b/hw/kdrive/mga/mgastub.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/nvidia/nvidia.c b/hw/kdrive/nvidia/nvidia.c
index 1703a30c4..be42e561a 100644
--- a/hw/kdrive/nvidia/nvidia.c
+++ b/hw/kdrive/nvidia/nvidia.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/nvidia/nvidia.h b/hw/kdrive/nvidia/nvidia.h
index 3a36b43d7..026233cc1 100644
--- a/hw/kdrive/nvidia/nvidia.h
+++ b/hw/kdrive/nvidia/nvidia.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/nvidia/nvidiacurs.c b/hw/kdrive/nvidia/nvidiacurs.c
index 9ac1efd53..4a5938162 100644
--- a/hw/kdrive/nvidia/nvidiacurs.c
+++ b/hw/kdrive/nvidia/nvidiacurs.c
@@ -1,6 +1,4 @@
/*
- * Id: tridentcurs.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/nvidia/nvidiadraw.c b/hw/kdrive/nvidia/nvidiadraw.c
index dda3ea37a..a39f79888 100644
--- a/hw/kdrive/nvidia/nvidiadraw.c
+++ b/hw/kdrive/nvidia/nvidiadraw.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/nvidia/nvidiadraw.h b/hw/kdrive/nvidia/nvidiadraw.h
index b7053ae49..bac11c2a6 100644
--- a/hw/kdrive/nvidia/nvidiadraw.h
+++ b/hw/kdrive/nvidia/nvidiadraw.h
@@ -1,6 +1,4 @@
/*
- * Id: tridentdraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.4 2000/10/11 06:04:40 keithp Exp $ */
#ifndef _TRIDENTDRAW_H_
#define _TRIDENTDRAW_H_
diff --git a/hw/kdrive/nvidia/nvidiastub.c b/hw/kdrive/nvidia/nvidiastub.c
index 230941958..0e8250e31 100644
--- a/hw/kdrive/nvidia/nvidiastub.c
+++ b/hw/kdrive/nvidia/nvidiastub.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/nvidia/nvidiavideo.c b/hw/kdrive/nvidia/nvidiavideo.c
index 1dd5a1c5d..ad7147dd1 100644
--- a/hw/kdrive/nvidia/nvidiavideo.c
+++ b/hw/kdrive/nvidia/nvidiavideo.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/pcmcia/modes.h b/hw/kdrive/pcmcia/modes.h
index 9087e9e74..0a078736f 100644
--- a/hw/kdrive/pcmcia/modes.h
+++ b/hw/kdrive/pcmcia/modes.h
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/
-/* $RCSId: $ */
#define V_NHSYNC 0x01
#define V_NVSYNC 0x02
diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c
index dfdd2f6a9..a1728c783 100644
--- a/hw/kdrive/pcmcia/pcmcia.c
+++ b/hw/kdrive/pcmcia/pcmcia.c
@@ -27,7 +27,6 @@
*
* Tested running under a Compaq IPAQ Pocket PC running Linux
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/pcmcia/pcmcia.h b/hw/kdrive/pcmcia/pcmcia.h
index cb4d13a6c..245e51b77 100644
--- a/hw/kdrive/pcmcia/pcmcia.h
+++ b/hw/kdrive/pcmcia/pcmcia.h
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.h,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
#ifndef _PCMCIA_H_
#define _PCMCIA_H_
diff --git a/hw/kdrive/pcmcia/pcmciacurs.c b/hw/kdrive/pcmcia/pcmciacurs.c
index 89770bc35..21d2d4adb 100644
--- a/hw/kdrive/pcmcia/pcmciacurs.c
+++ b/hw/kdrive/pcmcia/pcmciacurs.c
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/
-/* $RCSId: $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c
index ac3ec9dc2..e5dc1cb41 100644
--- a/hw/kdrive/pcmcia/pcmciarotate.c
+++ b/hw/kdrive/pcmcia/pcmciarotate.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.3 2001/07/21 04:13:26 keithp Exp $
- *
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c
index c32333ff3..f578f1bff 100644
--- a/hw/kdrive/pcmcia/pcmciashadow.c
+++ b/hw/kdrive/pcmcia/pcmciashadow.c
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c
index a56d2cbe2..779ad7f1b 100644
--- a/hw/kdrive/pcmcia/pcmciastub.c
+++ b/hw/kdrive/pcmcia/pcmciastub.c
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/r128/r128.c b/hw/kdrive/r128/r128.c
index 6758d64ab..9e7f312e0 100644
--- a/hw/kdrive/r128/r128.c
+++ b/hw/kdrive/r128/r128.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/r128/r128.h b/hw/kdrive/r128/r128.h
index 02e3c10d5..ae9ae03aa 100644
--- a/hw/kdrive/r128/r128.h
+++ b/hw/kdrive/r128/r128.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _R128_H_
#define _R128_H_
diff --git a/hw/kdrive/r128/r128draw.c b/hw/kdrive/r128/r128draw.c
index bdc55bba3..142cc8b3e 100644
--- a/hw/kdrive/r128/r128draw.c
+++ b/hw/kdrive/r128/r128draw.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/r128/r128stub.c b/hw/kdrive/r128/r128stub.c
index dbf3c0e82..b5ffd9d77 100644
--- a/hw/kdrive/r128/r128stub.c
+++ b/hw/kdrive/r128/r128stub.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/savage/s3.c b/hw/kdrive/savage/s3.c
index 95051f27b..c1b01e701 100644
--- a/hw/kdrive/savage/s3.c
+++ b/hw/kdrive/savage/s3.c
@@ -1,6 +1,4 @@
/*
- * Id: s3.c,v 1.3 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3.h b/hw/kdrive/savage/s3.h
index 86e1863b4..628abc806 100644
--- a/hw/kdrive/savage/s3.h
+++ b/hw/kdrive/savage/s3.h
@@ -1,6 +1,4 @@
/*
- * Id: s3.h,v 1.2 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.h,v 1.4 2000/05/06 22:17:45 keithp Exp $ */
#ifndef _S3_H_
#define _S3_H_
diff --git a/hw/kdrive/savage/s3clock.c b/hw/kdrive/savage/s3clock.c
index 40b6ed695..9e3f8b3e0 100644
--- a/hw/kdrive/savage/s3clock.c
+++ b/hw/kdrive/savage/s3clock.c
@@ -1,6 +1,4 @@
/*
- * Id: s3clock.c,v 1.2 1999/11/02 06:16:29 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3cmap.c b/hw/kdrive/savage/s3cmap.c
index 57f19f4df..094a24755 100644
--- a/hw/kdrive/savage/s3cmap.c
+++ b/hw/kdrive/savage/s3cmap.c
@@ -1,6 +1,4 @@
/*
- * Id: s3cmap.c,v 1.2 1999/11/02 06:16:29 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3curs.c b/hw/kdrive/savage/s3curs.c
index 0440205eb..95d4522d6 100644
--- a/hw/kdrive/savage/s3curs.c
+++ b/hw/kdrive/savage/s3curs.c
@@ -1,6 +1,4 @@
/*
- * Id: s3curs.c,v 1.2 1999/11/02 06:16:29 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c
index cda9be7fd..258dbcf79 100644
--- a/hw/kdrive/savage/s3draw.c
+++ b/hw/kdrive/savage/s3draw.c
@@ -1,6 +1,4 @@
/*
- * Id: s3draw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3draw.h b/hw/kdrive/savage/s3draw.h
index a95b53b12..068904370 100644
--- a/hw/kdrive/savage/s3draw.h
+++ b/hw/kdrive/savage/s3draw.h
@@ -1,6 +1,4 @@
/*
- * Id: s3draw.h,v 1.2 1999/11/02 06:16:29 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.h,v 1.4 2000/05/06 22:17:47 keithp Exp $ */
#ifndef _S3DRAW_H_
#define _S3DRAW_H_
diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c
index a87a2f579..ade14fa1f 100644
--- a/hw/kdrive/savage/s3gc.c
+++ b/hw/kdrive/savage/s3gc.c
@@ -1,6 +1,4 @@
/*
- * Id: s3gc.c,v 1.2 1999/11/02 06:16:29 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3reg.c b/hw/kdrive/savage/s3reg.c
index df2534bda..673a2ac8f 100644
--- a/hw/kdrive/savage/s3reg.c
+++ b/hw/kdrive/savage/s3reg.c
@@ -1,6 +1,4 @@
/*
- * Id: s3reg.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3reg.h b/hw/kdrive/savage/s3reg.h
index 9b3c5447b..5c5b09f6d 100644
--- a/hw/kdrive/savage/s3reg.h
+++ b/hw/kdrive/savage/s3reg.h
@@ -1,6 +1,4 @@
/*
- * Id: s3reg.h,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.h,v 1.3 2000/02/23 20:30:05 dawes Exp $ */
#ifndef _S3REG_H_
#define _S3REG_H_
diff --git a/hw/kdrive/savage/s3rtst.c b/hw/kdrive/savage/s3rtst.c
index 6bcd2a4ce..c24b860ac 100644
--- a/hw/kdrive/savage/s3rtst.c
+++ b/hw/kdrive/savage/s3rtst.c
@@ -1,6 +1,4 @@
/*
- * Id: s3rtst.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c
index 776f8dad2..145c5c1f6 100644
--- a/hw/kdrive/savage/s3stub.c
+++ b/hw/kdrive/savage/s3stub.c
@@ -1,6 +1,4 @@
/*
- * Id: s3stub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sdl/sdl.c b/hw/kdrive/sdl/sdl.c
index d7448ff7f..411b5d4e1 100644
--- a/hw/kdrive/sdl/sdl.c
+++ b/hw/kdrive/sdl/sdl.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 PillowElephantBadgerBankPond
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,7 +23,6 @@
* - jaymz
*
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include "kdrive-config.h"
#endif
diff --git a/hw/kdrive/sis300/sis.c b/hw/kdrive/sis300/sis.c
index 61fa997ee..30b7ac2c5 100644
--- a/hw/kdrive/sis300/sis.c
+++ b/hw/kdrive/sis300/sis.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis300/sis.h b/hw/kdrive/sis300/sis.h
index 21cbdfc55..25d55be31 100644
--- a/hw/kdrive/sis300/sis.h
+++ b/hw/kdrive/sis300/sis.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifndef _SIS_H_
#define _SIS_H_
diff --git a/hw/kdrive/sis300/sis_draw.c b/hw/kdrive/sis300/sis_draw.c
index 77e5829e4..bbc905e1d 100644
--- a/hw/kdrive/sis300/sis_draw.c
+++ b/hw/kdrive/sis300/sis_draw.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#include <sys/io.h>
diff --git a/hw/kdrive/sis300/sis_stub.c b/hw/kdrive/sis300/sis_stub.c
index 8a4c06c6c..bce7d02d2 100644
--- a/hw/kdrive/sis300/sis_stub.c
+++ b/hw/kdrive/sis300/sis_stub.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Eric Anholt
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c
index 023711af3..e1deb3b28 100644
--- a/hw/kdrive/sis530/sis.c
+++ b/hw/kdrive/sis530/sis.c
@@ -1,6 +1,4 @@
/*
- * Id: sis.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/sis.h b/hw/kdrive/sis530/sis.h
index 2a39d0ba2..194c33c02 100644
--- a/hw/kdrive/sis530/sis.h
+++ b/hw/kdrive/sis530/sis.h
@@ -1,6 +1,4 @@
/*
- * Id: sis.h,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.h,v 1.4 2000/05/06 22:17:49 keithp Exp $ */
#ifndef _SIS_H_
#define _SIS_H_
diff --git a/hw/kdrive/sis530/sisclock.c b/hw/kdrive/sis530/sisclock.c
index 06379e55a..f73cdac9d 100644
--- a/hw/kdrive/sis530/sisclock.c
+++ b/hw/kdrive/sis530/sisclock.c
@@ -1,6 +1,4 @@
/*
- * Id: sisclock.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/siscmap.c b/hw/kdrive/sis530/siscmap.c
index 42a008198..2a28420c8 100644
--- a/hw/kdrive/sis530/siscmap.c
+++ b/hw/kdrive/sis530/siscmap.c
@@ -1,6 +1,4 @@
/*
- * Id: siscmap.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/siscurs.c b/hw/kdrive/sis530/siscurs.c
index 94dfffe7c..dad44471c 100644
--- a/hw/kdrive/sis530/siscurs.c
+++ b/hw/kdrive/sis530/siscurs.c
@@ -1,6 +1,4 @@
/*
- * Id: siscurs.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c
index 20671c00a..fd80fa76a 100644
--- a/hw/kdrive/sis530/sisdraw.c
+++ b/hw/kdrive/sis530/sisdraw.c
@@ -1,6 +1,4 @@
/*
- * Id: sisdraw.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/sisdraw.h b/hw/kdrive/sis530/sisdraw.h
index 4bf67b2ac..971ad64ac 100644
--- a/hw/kdrive/sis530/sisdraw.h
+++ b/hw/kdrive/sis530/sisdraw.h
@@ -1,6 +1,4 @@
/*
- * Id: sisdraw.h,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.h,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */
#ifndef _SISDRAW_H_
#define _SISDRAW_H_
diff --git a/hw/kdrive/sis530/sisio.c b/hw/kdrive/sis530/sisio.c
index 7b4765f31..4741937a4 100644
--- a/hw/kdrive/sis530/sisio.c
+++ b/hw/kdrive/sis530/sisio.c
@@ -1,6 +1,4 @@
/*
- * Id: sisio.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c
index 2375f651b..960510bff 100644
--- a/hw/kdrive/sis530/sisstub.c
+++ b/hw/kdrive/sis530/sisstub.c
@@ -1,6 +1,4 @@
/*
- * Id: sisstub.c,v 1.1 1999/11/02 08:20:07 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/smi/smi.h b/hw/kdrive/smi/smi.h
index 19fdcbad4..ef0fd110a 100644
--- a/hw/kdrive/smi/smi.h
+++ b/hw/kdrive/smi/smi.h
@@ -1,6 +1,4 @@
/*
- * Id: smi.h,v 1.2 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 2001 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c
index 06606ad1b..ba4e3904d 100644
--- a/hw/kdrive/smi/smidraw.c
+++ b/hw/kdrive/smi/smidraw.c
@@ -1,6 +1,4 @@
/*
- * Id: smidraw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/smi/smidraw.h b/hw/kdrive/smi/smidraw.h
index f91b68c56..4165c7406 100644
--- a/hw/kdrive/smi/smidraw.h
+++ b/hw/kdrive/smi/smidraw.h
@@ -1,6 +1,4 @@
/*
- * Id: smidraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c
index 1db6708f2..59faf2839 100644
--- a/hw/kdrive/smi/smistub.c
+++ b/hw/kdrive/smi/smistub.c
@@ -1,6 +1,4 @@
/*
- * Id: smistub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index c29e9e9f0..c9805ddb6 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.4 2001/06/04 09:45:41 keithp Exp $
- *
* Copyright © 2001 Keith Packard
*
* Partly based on code that is Copyright © The XFree86 Project Inc.
diff --git a/hw/kdrive/src/kaa.h b/hw/kdrive/src/kaa.h
index 15f2faac2..db890a75b 100644
--- a/hw/kdrive/src/kaa.h
+++ b/hw/kdrive/src/kaa.h
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 2001 Keith Packard
*
* Partly based on code that is Copyright © The XFree86 Project Inc.
diff --git a/hw/kdrive/src/kaapict.c b/hw/kdrive/src/kaapict.c
index 6d44b726a..501b6b9c4 100644
--- a/hw/kdrive/src/kaapict.c
+++ b/hw/kdrive/src/kaapict.c
@@ -1,6 +1,4 @@
/*
- * $RCSId$
- *
* Copyright © 2001 Keith Packard
*
* Partly based on code that is Copyright © The XFree86 Project Inc.
diff --git a/hw/kdrive/src/kasync.c b/hw/kdrive/src/kasync.c
index 00d756fc9..9da3406f7 100644
--- a/hw/kdrive/src/kasync.c
+++ b/hw/kdrive/src/kasync.c
@@ -1,6 +1,4 @@
/*
- * Id: kasync.c,v 1.3 1999/11/24 04:29:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.8 2001/03/30 02:15:19 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c
index 92ce5b920..4941ad17f 100644
--- a/hw/kdrive/src/kcmap.c
+++ b/hw/kdrive/src/kcmap.c
@@ -1,6 +1,4 @@
/*
- * Id: kcmap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kcolor.c b/hw/kdrive/src/kcolor.c
index c3669abdf..31af5c37e 100644
--- a/hw/kdrive/src/kcolor.c
+++ b/hw/kdrive/src/kcolor.c
@@ -1,6 +1,4 @@
/*
- * Id: kcolor.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kcolor.c,v 1.2 1999/12/30 03:03:05 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kcurscol.c b/hw/kdrive/src/kcurscol.c
index 943417e0d..6a17df30f 100644
--- a/hw/kdrive/src/kcurscol.c
+++ b/hw/kdrive/src/kcurscol.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/kcurscol.c,v 1.4 2000/05/11 18:14:13 tsi Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index b6ac0b0cf..dfe264a1a 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.29 2002/10/31 18:29:50 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index ced48d7a8..1397cf59b 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -1,6 +1,4 @@
/*
- * Id: kdrive.h,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.29 2002/11/13 16:37:39 keithp Exp $ */
#ifndef _KDRIVE_H_
#define _KDRIVE_H_
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c
index 1e03ac8a2..2621f10dd 100644
--- a/hw/kdrive/src/kinfo.c
+++ b/hw/kdrive/src/kinfo.c
@@ -1,6 +1,4 @@
/*
- * Id: kinfo.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kinfo.c,v 1.2 2000/02/23 20:29:53 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 7b22d170a..372ffc8d8 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1,6 +1,4 @@
/*
- * Id: kinput.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
* Copyright © 2006 Nokia Corporation
*
@@ -22,7 +20,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kkeymap.c b/hw/kdrive/src/kkeymap.c
index ce4596fc8..ae90a3499 100644
--- a/hw/kdrive/src/kkeymap.c
+++ b/hw/kdrive/src/kkeymap.c
@@ -1,6 +1,4 @@
/*
- * Id: kkeymap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.c,v 1.1 1999/11/19 13:53:49 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kkeymap.h b/hw/kdrive/src/kkeymap.h
index ccc5e86f8..f66cfa49a 100644
--- a/hw/kdrive/src/kkeymap.h
+++ b/hw/kdrive/src/kkeymap.h
@@ -1,6 +1,4 @@
/*
- * Id: kkeymap.h,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
/*
* All global variables and functions pertaining to keyboard key mapping
* live in this header file.
diff --git a/hw/kdrive/src/kloadmap.c b/hw/kdrive/src/kloadmap.c
index b62b2deb2..21440a423 100644
--- a/hw/kdrive/src/kloadmap.c
+++ b/hw/kdrive/src/kloadmap.c
@@ -1,6 +1,4 @@
/*
- * Id: kloadmap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kloadmap.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c
index 73ff427c5..b92c1a84f 100644
--- a/hw/kdrive/src/kmap.c
+++ b/hw/kdrive/src/kmap.c
@@ -1,6 +1,4 @@
/*
- * Id: kmap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */
#include <kdrive-config.h>
#include "kdrive.h"
diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c
index 5a0c09095..d02cb55e1 100644
--- a/hw/kdrive/src/kmode.c
+++ b/hw/kdrive/src/kmode.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.7 2002/10/14 18:01:40 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/src/knoop.c b/hw/kdrive/src/knoop.c
index 416e23ef5..a3e9468ed 100644
--- a/hw/kdrive/src/knoop.c
+++ b/hw/kdrive/src/knoop.c
@@ -1,6 +1,4 @@
/*
- * Id: knoop.c,v 1.2 1999/11/02 06:16:28 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/knoop.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
/*
* GC ops that don't do anything
diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c
index eeb35fa56..efe03642f 100644
--- a/hw/kdrive/src/koffscreen.c
+++ b/hw/kdrive/src/koffscreen.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Anders Carlsson
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c
index 34e1d5de4..ea44812db 100644
--- a/hw/kdrive/src/kshadow.c
+++ b/hw/kdrive/src/kshadow.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/src/ktest.c b/hw/kdrive/src/ktest.c
index 935c00e62..150af5639 100644
--- a/hw/kdrive/src/ktest.c
+++ b/hw/kdrive/src/ktest.c
@@ -1,6 +1,4 @@
/*
- * Id: ktest.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/ktest.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 4e672f16f..b8fbd731b 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -35,8 +35,6 @@ of the copyright holder.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.c,v 1.3 2001/08/09 09:08:54 keithp Exp $ */
-
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
diff --git a/hw/kdrive/src/kxv.h b/hw/kdrive/src/kxv.h
index b9eca8b8e..5d1441642 100644
--- a/hw/kdrive/src/kxv.h
+++ b/hw/kdrive/src/kxv.h
@@ -35,8 +35,6 @@ of the copyright holder.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
-
#ifndef _XVDIX_H_
#define _XVDIX_H_
diff --git a/hw/kdrive/src/vga.c b/hw/kdrive/src/vga.c
index 9b8a7da39..862f074a2 100644
--- a/hw/kdrive/src/vga.c
+++ b/hw/kdrive/src/vga.c
@@ -1,6 +1,4 @@
/*
- * Id: vga.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/vga.c,v 1.2 1999/12/30 03:03:07 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/src/vga.h b/hw/kdrive/src/vga.h
index 5d7e77307..0615d5256 100644
--- a/hw/kdrive/src/vga.h
+++ b/hw/kdrive/src/vga.h
@@ -1,6 +1,4 @@
/*
- * Id: vga.h,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/vga.h,v 1.2 1999/12/30 03:03:07 robin Exp $ */
#ifndef _VGA_H_
#define _VGA_H_
diff --git a/hw/kdrive/trident/trident.c b/hw/kdrive/trident/trident.c
index 59f044896..694a70810 100644
--- a/hw/kdrive/trident/trident.c
+++ b/hw/kdrive/trident/trident.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trident/trident.h b/hw/kdrive/trident/trident.h
index 0b0d8cb48..feb939de3 100644
--- a/hw/kdrive/trident/trident.h
+++ b/hw/kdrive/trident/trident.h
@@ -1,6 +1,4 @@
/*
- * Id: trident.h,v 1.2 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.h,v 1.8 2000/10/20 00:19:51 keithp Exp $ */
#ifndef _TRIDENT_H_
#define _TRIDENT_H_
diff --git a/hw/kdrive/trident/tridentcurs.c b/hw/kdrive/trident/tridentcurs.c
index 521cf98d2..4a5938162 100644
--- a/hw/kdrive/trident/tridentcurs.c
+++ b/hw/kdrive/trident/tridentcurs.c
@@ -1,6 +1,4 @@
/*
- * Id: tridentcurs.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c
index 3ebba88d8..c26d0be8b 100644
--- a/hw/kdrive/trident/tridentdraw.c
+++ b/hw/kdrive/trident/tridentdraw.c
@@ -1,6 +1,4 @@
/*
- * Id: tridentdraw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trident/tridentdraw.h b/hw/kdrive/trident/tridentdraw.h
index ec09167a8..bac11c2a6 100644
--- a/hw/kdrive/trident/tridentdraw.h
+++ b/hw/kdrive/trident/tridentdraw.h
@@ -1,6 +1,4 @@
/*
- * Id: tridentdraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.2 1999/12/30 03:03:18 robin Exp $ */
#ifndef _TRIDENTDRAW_H_
#define _TRIDENTDRAW_H_
diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c
index 650206aac..0792a50d4 100644
--- a/hw/kdrive/trident/tridentstub.c
+++ b/hw/kdrive/trident/tridentstub.c
@@ -1,6 +1,4 @@
/*
- * Id: tridentstub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trio/s3.c b/hw/kdrive/trio/s3.c
index 6fb8c967f..cb5104926 100644
--- a/hw/kdrive/trio/s3.c
+++ b/hw/kdrive/trio/s3.c
@@ -1,6 +1,4 @@
/*
- * Id: s3.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trio/s3.h b/hw/kdrive/trio/s3.h
index 6f443ea97..b45a8ba80 100644
--- a/hw/kdrive/trio/s3.h
+++ b/hw/kdrive/trio/s3.h
@@ -1,6 +1,4 @@
/*
- * Id: s3.h,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.h,v 1.4 2000/05/06 22:17:53 keithp Exp $ */
#ifndef _S3_H_
#define _S3_H_
diff --git a/hw/kdrive/trio/s3clock.c b/hw/kdrive/trio/s3clock.c
index 9fdd35e99..9f2d313ca 100644
--- a/hw/kdrive/trio/s3clock.c
+++ b/hw/kdrive/trio/s3clock.c
@@ -1,6 +1,4 @@
/*
- * Id: s3clock.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trio/s3cmap.c b/hw/kdrive/trio/s3cmap.c
index d59f29659..cc32da38c 100644
--- a/hw/kdrive/trio/s3cmap.c
+++ b/hw/kdrive/trio/s3cmap.c
@@ -1,6 +1,4 @@
/*
- * Id: s3cmap.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trio/s3curs.c b/hw/kdrive/trio/s3curs.c
index 4d802c518..60e72c687 100644
--- a/hw/kdrive/trio/s3curs.c
+++ b/hw/kdrive/trio/s3curs.c
@@ -1,6 +1,4 @@
/*
- * Id: s3curs.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c
index 7531858c5..f44ad84c6 100644
--- a/hw/kdrive/trio/s3stub.c
+++ b/hw/kdrive/trio/s3stub.c
@@ -1,6 +1,4 @@
/*
- * Id: s3stub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c
index 620ee7f40..e9ff3a3da 100644
--- a/hw/kdrive/ts300/ts300.c
+++ b/hw/kdrive/ts300/ts300.c
@@ -1,6 +1,4 @@
/*
- * Id: ts300.c,v 1.1 1999/11/02 08:17:24 keithp Exp $
- *
* Copyright © 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c
index 08f0b037c..cedefe9fc 100644
--- a/hw/kdrive/vesa/vbe.c
+++ b/hw/kdrive/vesa/vbe.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/vesa/vbe.h b/hw/kdrive/vesa/vbe.h
index 5d0ff5142..f67fbbe42 100644
--- a/hw/kdrive/vesa/vbe.h
+++ b/hw/kdrive/vesa/vbe.h
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.h,v 1.6 2001/05/29 04:54:12 keithp Exp $ */
#ifndef _VBE_H
#define _VBE_H
diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c
index 766cacdc8..d6fa5eb06 100644
--- a/hw/kdrive/vesa/vesa.c
+++ b/hw/kdrive/vesa/vesa.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $Id$ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/vesa/vesa.h b/hw/kdrive/vesa/vesa.h
index 83be725eb..f6b21e9f5 100644
--- a/hw/kdrive/vesa/vesa.h
+++ b/hw/kdrive/vesa/vesa.h
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesa.h,v 1.13 2002/09/29 23:39:47 keithp Exp $ */
#ifndef _VESA_H_
#define _VESA_H_
diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c
index 4f552d1a1..90b168108 100644
--- a/hw/kdrive/vesa/vesainit.c
+++ b/hw/kdrive/vesa/vesainit.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
diff --git a/hw/kdrive/vesa/vga.c b/hw/kdrive/vesa/vga.c
index 3050eacce..0367a5f06 100644
--- a/hw/kdrive/vesa/vga.c
+++ b/hw/kdrive/vesa/vga.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vga.c,v 1.1 2000/10/20 00:19:51 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/vesa/vga.h b/hw/kdrive/vesa/vga.h
index ca000904b..9a368cef7 100644
--- a/hw/kdrive/vesa/vga.h
+++ b/hw/kdrive/vesa/vga.h
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vga.h,v 1.1 2000/10/20 00:19:51 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c
index d09a36dee..78fc593a7 100644
--- a/hw/kdrive/vesa/vm86.c
+++ b/hw/kdrive/vesa/vm86.c
@@ -1,6 +1,4 @@
/*
- * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vm86.c,v 1.2 2002/02/19 00:18:05 keithp Exp $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/vesa/vm86.h b/hw/kdrive/vesa/vm86.h
index bd1ad43c0..3b4881471 100644
--- a/hw/kdrive/vesa/vm86.h
+++ b/hw/kdrive/vesa/vm86.h
@@ -1,6 +1,4 @@
/*
- * $RCSId: $
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/kdrive/vxworks/vxkbd.c b/hw/kdrive/vxworks/vxkbd.c
index b421e923e..be528c78a 100644
--- a/hw/kdrive/vxworks/vxkbd.c
+++ b/hw/kdrive/vxworks/vxkbd.c
@@ -1,6 +1,4 @@
/*
- * Id: vxkbd.c,v 1.1 1999/11/24 08:35:24 keithp Exp $
- *
* Copyright © 1999 Network Computing Devices, Inc. All rights reserved.
*
* Author: Keith Packard
diff --git a/hw/kdrive/vxworks/vxmouse.c b/hw/kdrive/vxworks/vxmouse.c
index 97e24af4a..8192d7e5a 100644
--- a/hw/kdrive/vxworks/vxmouse.c
+++ b/hw/kdrive/vxworks/vxmouse.c
@@ -1,6 +1,4 @@
/*
- * Id: vxmouse.c,v 1.1 1999/11/24 08:35:24 keithp Exp $
- *
* Copyright © 1999 Network Computing Devices, Inc. All rights reserved.
*
* Author: Keith Packard
diff --git a/hw/kdrive/vxworks/vxworks.c b/hw/kdrive/vxworks/vxworks.c
index 688de620b..c9e2be7cc 100644
--- a/hw/kdrive/vxworks/vxworks.c
+++ b/hw/kdrive/vxworks/vxworks.c
@@ -1,6 +1,4 @@
/*
- * Id: vxworks.c,v 1.1 1999/11/24 08:35:24 keithp Exp $
- *
* Copyright © 1999 Network Computing Devices, Inc. All rights reserved.
*
* Author: Keith Packard
diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h
index 1415fce20..f31f53377 100644
--- a/hw/xfree86/common/atKeynames.h
+++ b/hw/xfree86/common/atKeynames.h
@@ -47,8 +47,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */
-
#ifndef _ATKEYNAMES_H
#define _ATKEYNAMES_H
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index becd3da25..73ca3d0ac 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -47,8 +47,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */
-
#ifndef _COMPILER_H
# define _COMPILER_H
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 46d812804..44c1a7733 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -25,8 +25,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */
-
#define NEED_EVENTS
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h
index f7ac89b1b..b93ac7d23 100644
--- a/hw/xfree86/common/xf86Version.h
+++ b/hw/xfree86/common/xf86Version.h
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 1994-2003 by The XFree86 Project, Inc.
*
@@ -55,5 +54,3 @@
0)
#endif
-
-/* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c
index b805885bd..11694544a 100644
--- a/hw/xfree86/common/xf86XKB.c
+++ b/hw/xfree86/common/xf86XKB.c
@@ -1,4 +1,3 @@
-/* $XConsortium: xf86XKB.c /main/4 1996/02/04 09:28:04 kaleb $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index f3d2f2169..b9f7aeda6 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -45,7 +45,6 @@
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
-/* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index f882b2608..d88bbbeee 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -1,4 +1,3 @@
-/* $XConsortium: xf86Xinput.h /main/11 1996/10/27 11:05:29 kaleb $ */
/*
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
*
diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h
index 01ae675c4..b7bdd5682 100644
--- a/hw/xfree86/common/xisb.h
+++ b/hw/xfree86/common/xisb.h
@@ -24,7 +24,6 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86$ */
#ifndef _xisb_H_
#define _xisb_H_
diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h
index 16fc4c8b2..2b1737305 100644
--- a/hw/xfree86/dixmods/extmod/xf86dgaext.h
+++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c
index c66ee3329..e147c7303 100644
--- a/hw/xfree86/dummylib/fatalerror.c
+++ b/hw/xfree86/dummylib/fatalerror.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c
index 43e417560..65288d81b 100644
--- a/hw/xfree86/dummylib/pcitestmulti.c
+++ b/hw/xfree86/dummylib/pcitestmulti.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c
index ae692bdc6..c75d1bc6d 100644
--- a/hw/xfree86/dummylib/verrorf.c
+++ b/hw/xfree86/dummylib/verrorf.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c
index 8abad9fa5..926884884 100644
--- a/hw/xfree86/dummylib/xf86allocscripi.c
+++ b/hw/xfree86/dummylib/xf86allocscripi.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c
index ec13c9b41..8859c7673 100644
--- a/hw/xfree86/dummylib/xf86getpagesize.c
+++ b/hw/xfree86/dummylib/xf86getpagesize.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c
index dae6c68d7..a489e9ca3 100644
--- a/hw/xfree86/dummylib/xf86getverb.c
+++ b/hw/xfree86/dummylib/xf86getverb.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c
index bfbda9e18..221a9d2bb 100644
--- a/hw/xfree86/dummylib/xf86info.c
+++ b/hw/xfree86/dummylib/xf86info.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c
index 32a35ef91..6288c60dc 100644
--- a/hw/xfree86/dummylib/xf86screens.c
+++ b/hw/xfree86/dummylib/xf86screens.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c
index f65bf1e9c..c356a2b88 100644
--- a/hw/xfree86/dummylib/xf86servisinit.c
+++ b/hw/xfree86/dummylib/xf86servisinit.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c
index 0d31cb153..c4a45d68e 100644
--- a/hw/xfree86/dummylib/xf86verbose.c
+++ b/hw/xfree86/dummylib/xf86verbose.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c
index a30675083..defda3cdc 100644
--- a/hw/xfree86/i2c/uda1380.c
+++ b/hw/xfree86/i2c/uda1380.c
@@ -1,6 +1,4 @@
/*************************************************************************************
- * $Id$
- *
* Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this
diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h
index 95ad92b92..e671d66f8 100644
--- a/hw/xfree86/i2c/uda1380.h
+++ b/hw/xfree86/i2c/uda1380.h
@@ -1,6 +1,4 @@
/*************************************************************************************
- * $Id$
- *
* Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this
@@ -22,7 +20,6 @@
* otherwise to promote the sale, use or other dealings in this Software without prior written
* authorization from the author.
*
- * $Log$
* Revision 1.3 2005/09/24 21:56:00 bogdand
* Changed the license to a X/MIT one
*
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 5b52bd76c..ea9f85baa 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -1,6 +1,3 @@
-/* -*- c-basic-offset: 4 -*- */
-/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.10 2006/03/07 16:00:57 libv Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 9fa0f361d..f5215ef94 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -1,7 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.3 2004/07/30 21:53:09 eich Exp $ */
/*
- * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $
- *
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h
index b50313607..718312cf0 100644
--- a/hw/xfree86/os-support/assyntax.h
+++ b/hw/xfree86/os-support/assyntax.h
@@ -1,4 +1,3 @@
-
#ifndef __ASSYNTAX_H__
#define __ASSYNTAX_H__
@@ -50,8 +49,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XConsortium: assyntax.h /main/5 1996/02/21 17:50:49 kaleb $ */
-
/*
* assyntax.h
*
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 5052b7862..a1b19d0f6 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -23,8 +23,6 @@
*
*/
-/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 4a3d5ca52..b556563d3 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -56,8 +56,6 @@
*
*/
-/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c
index 00591d135..476a0e957 100644
--- a/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -22,7 +22,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: bsd_VTsw.c /main/4 1996/02/21 17:50:57 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index c8e204307..61779875c 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index eb6d85053..07f031fa8 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -22,7 +22,6 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: bsd_init.c /main/8 1996/10/23 13:13:05 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c
index 08180106d..b6c755852 100644
--- a/hw/xfree86/os-support/bsd/bsd_kmod.c
+++ b/hw/xfree86/os-support/bsd/bsd_kmod.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
index 0a0434f2a..b0171e2c3 100644
--- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
@@ -25,7 +25,6 @@
* or other dealings in this Software without prior written authorization
* from the XFree86 Project.
*/
-/* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index ae16b78aa..e7db6c10e 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -23,8 +23,6 @@
*
*/
-/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c
index df5a9d2f6..292e5d885 100644
--- a/hw/xfree86/os-support/bsd/libusb/data.c
+++ b/hw/xfree86/os-support/bsd/libusb/data.c
@@ -1,5 +1,3 @@
-/* $NetBSD: data.c,v 1.6 1999/09/20 04:48:12 lukem Exp $ */
-
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c
index bbcb55853..4dc3524d5 100644
--- a/hw/xfree86/os-support/bsd/libusb/descr.c
+++ b/hw/xfree86/os-support/bsd/libusb/descr.c
@@ -1,5 +1,3 @@
-/* $NetBSD: descr.c,v 1.7 1999/10/13 17:48:04 drochner Exp $ */
-
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c
index c68ccb524..0a846e42b 100644
--- a/hw/xfree86/os-support/bsd/libusb/parse.c
+++ b/hw/xfree86/os-support/bsd/libusb/parse.c
@@ -1,5 +1,3 @@
-/* $NetBSD: parse.c,v 1.7 1999/10/13 17:48:04 drochner Exp $ */
-
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c
index a8a5f650e..9b491c57a 100644
--- a/hw/xfree86/os-support/bsd/libusb/usage.c
+++ b/hw/xfree86/os-support/bsd/libusb/usage.c
@@ -1,5 +1,3 @@
-/* $NetBSD: usage.c,v 1.4 1999/07/02 15:46:53 simonb Exp $ */
-
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h
index fedd3e545..c39dc063a 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb.h
+++ b/hw/xfree86/os-support/bsd/libusb/usb.h
@@ -1,5 +1,3 @@
-/* $NetBSD: usb.h,v 1.5 1999/07/02 15:46:53 simonb Exp $ */
-
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h
index db2cae171..ce38a0730 100644
--- a/hw/xfree86/os-support/bsd/libusb/usbvar.h
+++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h
@@ -1,5 +1,3 @@
-/* $NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $ */
-
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
* All rights reserved.
diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
index 0f4b270f4..03c479144 100644
--- a/hw/xfree86/os-support/bsd/memrange.h
+++ b/hw/xfree86/os-support/bsd/memrange.h
@@ -1,9 +1,6 @@
/*
* Memory range attribute operations, peformed on /dev/mem
- *
- * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $
*/
-/* $XFree86$ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 6a23b4e5c..06be654e1 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -23,8 +23,6 @@
*
*/
-/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c
index 0cb9d4d56..fb5e8529b 100644
--- a/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -23,9 +23,6 @@
*
*/
-
-/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c
index aec5b3d46..8cd8f54d6 100644
--- a/hw/xfree86/os-support/hurd/hurd_init.c
+++ b/hw/xfree86/os-support/hurd/hurd_init.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_init.c,v 1.1 1998/08/16 10:25:48 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/hurd/hurd_mmap.c b/hw/xfree86/os-support/hurd/hurd_mmap.c
index 5e800d28b..ccef5f218 100644
--- a/hw/xfree86/os-support/hurd/hurd_mmap.c
+++ b/hw/xfree86/os-support/hurd/hurd_mmap.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86$ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/hurd/hurd_mouse.c b/hw/xfree86/os-support/hurd/hurd_mouse.c
index ccc08a248..5f6d9437f 100644
--- a/hw/xfree86/os-support/hurd/hurd_mouse.c
+++ b/hw/xfree86/os-support/hurd/hurd_mouse.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_mouse.c,v 1.7 2000/02/10 22:33:44 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_XORG_CONFIG_H
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index b8892831c..8e6ae8d36 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_video.c,v 1.3 1999/04/29 12:24:52 dawes Exp $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
index 48500dbbf..9412b07a4 100644
--- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 9775180a8..4c36b7cf4 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -22,7 +22,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c
index 6ed0e44c6..d77631ba4 100644
--- a/hw/xfree86/os-support/linux/lnx_jstk.c
+++ b/hw/xfree86/os-support/linux/lnx_jstk.c
@@ -1,5 +1,3 @@
-/* $XConsortium: lnx_jstk.c /main/7 1996/02/21 17:51:36 kaleb $ */
-/* Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp */
/*
* Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net>
*
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 0bc99b038..b3494a78e 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -22,7 +22,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c
index 54b7c1816..e4422f234 100644
--- a/hw/xfree86/os-support/misc/IODelay.c
+++ b/hw/xfree86/os-support/misc/IODelay.c
@@ -1,9 +1,6 @@
-
-/* $XConsortium: IODelay.c /main/1 1996/05/07 17:13:43 kaleb $ */
/*******************************************************************************
Stub for Alpha Linux
*******************************************************************************/
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
index f0ad61132..7694eaa23 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -1,9 +1,6 @@
-
-/* $XConsortium: SlowBcopy.c /main/1 1996/05/07 17:14:10 kaleb $ */
/*******************************************************************************
for Alpha Linux
*******************************************************************************/
-
/*
* Create a dependency that should be immune from the effect of register
diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c
index 1ec0f569d..6c9871d93 100644
--- a/hw/xfree86/os-support/misc/xf86_IlHack.c
+++ b/hw/xfree86/os-support/misc/xf86_IlHack.c
@@ -4,8 +4,6 @@
*
* Note: this doesn't work when using a compiler other than GCC.
*/
-/* $XConsortium: xf86_IlHack.c /main/4 1996/02/21 17:52:26 kaleb $ */
-
#define static /**/
#define __inline__ /**/
diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c
index 77df1e248..9e690591d 100644
--- a/hw/xfree86/os-support/misc/xf86_Util.c
+++ b/hw/xfree86/os-support/misc/xf86_Util.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: xf86_Util.c /main/5 1996/10/23 13:13:10 kaleb $ */
/*
* This file is for utility functions that will be shared by other pieces
diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c
index ba2f7adee..d126e7869 100644
--- a/hw/xfree86/os-support/sco/VTsw_sco.c
+++ b/hw/xfree86/os-support/sco/VTsw_sco.c
@@ -21,7 +21,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: VTsw_sco.c /main/2 1995/11/13 06:08:36 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c
index 07f30f019..5f7db3437 100644
--- a/hw/xfree86/os-support/sco/sco_init.c
+++ b/hw/xfree86/os-support/sco/sco_init.c
@@ -19,7 +19,6 @@
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XConsortium$ */
/* Re-written May 2001 to represent the current state of reality */
diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c
index 4870266d8..bb8d06d2e 100644
--- a/hw/xfree86/os-support/sco/sco_iop.c
+++ b/hw/xfree86/os-support/sco/sco_iop.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2001 by J. Kean Johnston <jkj@caldera.com>
*
@@ -20,7 +19,6 @@
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XConsortium$ */
#ifdef HAVE_XORG_CONFIG_H
diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c
index 29e1f6f3c..af57cdedf 100644
--- a/hw/xfree86/os-support/sco/sco_mouse.c
+++ b/hw/xfree86/os-support/sco/sco_mouse.c
@@ -20,8 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XConsortium$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c
index 807028f6a..7edf71db3 100644
--- a/hw/xfree86/os-support/sco/sco_video.c
+++ b/hw/xfree86/os-support/sco/sco_video.c
@@ -19,7 +19,6 @@
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XConsortium$ */
/* Re-written May 2001 to represent the current state of reality */
diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c
index fd05f399c..a3cfe40b9 100644
--- a/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index 0100ae928..4d473147f 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c
index 86d38292f..7288239be 100644
--- a/hw/xfree86/os-support/shared/bios_devmem.c
+++ b/hw/xfree86/os-support/shared/bios_devmem.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c
index 40d37e0c3..cccf86a04 100644
--- a/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/hw/xfree86/os-support/shared/bios_mmap.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c
index 2427d1923..1d7851a5b 100644
--- a/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: ioperm_noop.c /main/3 1996/02/21 17:53:39 kaleb $ */
/*
* Some platforms don't bother with I/O permissions,
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 6e1b54331..002e3a275 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -52,8 +52,6 @@
*
*/
-/* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h
index 4b8b08370..5e9d6284c 100644
--- a/hw/xfree86/os-support/shared/xf86Axp.h
+++ b/hw/xfree86/os-support/shared/xf86Axp.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c
index 6d0045f9b..170bb8914 100644
--- a/hw/xfree86/os-support/sysv/sysv_init.c
+++ b/hw/xfree86/os-support/sysv/sysv_init.c
@@ -22,7 +22,6 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: sysv_init.c /main/4 1996/02/21 17:54:31 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c
index fd6d61321..5811947bd 100644
--- a/hw/xfree86/os-support/sysv/sysv_video.c
+++ b/hw/xfree86/os-support/sysv/sysv_video.c
@@ -22,7 +22,6 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: sysv_video.c /main/8 1996/10/25 11:38:09 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/os-support/usl/usl_init.c b/hw/xfree86/os-support/usl/usl_init.c
index 120ce1bcc..d27b206c8 100644
--- a/hw/xfree86/os-support/usl/usl_init.c
+++ b/hw/xfree86/os-support/usl/usl_init.c
@@ -1,4 +1,3 @@
-/* $XdotOrg$ */
/*
* Copyright 2001-2005 by Kean Johnston <jkj@sco.com>
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
@@ -25,7 +24,6 @@
* THIS SOFTWARE.
*
*/
-/* $XConsortium$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/os-support/usl/usl_iop.c b/hw/xfree86/os-support/usl/usl_iop.c
index 23c36fbf7..c6382fc7e 100644
--- a/hw/xfree86/os-support/usl/usl_iop.c
+++ b/hw/xfree86/os-support/usl/usl_iop.c
@@ -19,7 +19,6 @@
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XConsortium$ */
#include "X.h"
diff --git a/hw/xfree86/os-support/usl/usl_video.c b/hw/xfree86/os-support/usl/usl_video.c
index 160282aab..41abd2259 100644
--- a/hw/xfree86/os-support/usl/usl_video.c
+++ b/hw/xfree86/os-support/usl/usl_video.c
@@ -1,4 +1,3 @@
-/* $XdotOrg$ */
/*
* Copyrught 2005 Kean Johnston <jkj@sco.com>
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
@@ -25,7 +24,6 @@
* THIS SOFTWARE.
*
*/
-/* $XConsortium$ */
#include "X.h"
diff --git a/hw/xfree86/os-support/usl/usl_vtsw.c b/hw/xfree86/os-support/usl/usl_vtsw.c
index 5c6673f31..812e5bddb 100644
--- a/hw/xfree86/os-support/usl/usl_vtsw.c
+++ b/hw/xfree86/os-support/usl/usl_vtsw.c
@@ -1,4 +1,3 @@
-/* $XdotOrg$ */
/*
* Copyright 2005 by Kean Johnston <jkj@sco.com>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
@@ -23,7 +22,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium$ */
#include "X.h"
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 216e2eceb..fcc79be38 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -65,8 +65,6 @@
*
*/
-/* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */
-
/*
* This is private, and should not be included by any drivers. Drivers
* may include xf86_OSproc.h to get prototypes for public interfaces.
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 75a562bc1..55c7eb55f 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -1,5 +1,4 @@
/*
- *
* Copyright (c) 1997 Metro Link Incorporated
*
* Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
index afa8510b0..5f8bdbd7f 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
@@ -1,10 +1,5 @@
-
-
/* Keyboard mode control program for 386BSD */
-
-/* $XConsortium: kbd_mode.c /main/7 1996/03/11 10:46:12 kaleb $ */
-
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
index 96a4644a0..f2802a6b8 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
@@ -1,4 +1,3 @@
-/* $XdotOrg: $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h
index 2c7121871..fbb02a7ab 100644
--- a/hw/xfree86/utils/xorgcfg/card-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/card-cfg.h
@@ -26,7 +26,6 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h
index d582a8172..141f50402 100644
--- a/hw/xfree86/utils/xorgcfg/help.h
+++ b/hw/xfree86/utils/xorgcfg/help.h
@@ -25,8 +25,6 @@
* Conectiva Linux.
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
- *
- * $XFree86$
*/
/* help string definitions */
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h
index ebd7ee662..90e5980e6 100644
--- a/hw/xfree86/utils/xorgcfg/mouse-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.h
@@ -25,8 +25,6 @@
* Conectiva Linux.
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
- *
- * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h
index b667ec685..7e1438db8 100644
--- a/hw/xfree86/utils/xorgconfig/cards.h
+++ b/hw/xfree86/utils/xorgconfig/cards.h
@@ -1,10 +1,3 @@
-
-
-
-
-
-/* $XConsortium: cards.h /main/3 1996/02/21 18:12:53 kaleb $ */
-
#ifndef CARD_DATABASE_FILE
#define CARD_DATABASE_FILE "Cards"
#endif
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 56897899c..736b01183 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -90,7 +90,6 @@
* - Add font path "/TrueType/" and "/freefont/".
* Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp)
*/
-/* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */
#ifdef HAVE_CONFIG_H
# include "xorg-server.h"
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index c7c58d582..609376a57 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -20,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
index f6aacb85e..155daa4ee 100644
--- a/hw/xfree86/xaa/xaaROP.c
+++ b/hw/xfree86/xaa/xaaROP.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h
index 1c95727b3..548993c49 100644
--- a/hw/xfree86/xaa/xaarop.h
+++ b/hw/xfree86/xaa/xaarop.h
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
/*
int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop)
diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h
index 65f002000..8a8bbb59c 100644
--- a/hw/xfree86/xf4bpp/OScompiler.h
+++ b/hw/xfree86/xf4bpp/OScompiler.h
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: OScompiler.h /main/4 1996/02/21 17:56:09 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c
index 22ba90c2b..542e9d394 100644
--- a/hw/xfree86/xf4bpp/emulOpStip.c
+++ b/hw/xfree86/xf4bpp/emulOpStip.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: emulOpStip.c /main/4 1996/02/21 17:56:12 kaleb $ */
/* ppc OpaqueStipple
*
diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c
index 235bf9bd0..20fff1e0c 100644
--- a/hw/xfree86/xf4bpp/emulRepAre.c
+++ b/hw/xfree86/xf4bpp/emulRepAre.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: emulRepAre.c /main/5 1996/02/21 17:56:16 kaleb $ */
/* ppc Replicate Area -- A Divide & Conquer Algorithm
* a "ppc" Helper Function For Stipples And Tiling
diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c
index ddce1dab0..2f2a758f2 100644
--- a/hw/xfree86/xf4bpp/emulTile.c
+++ b/hw/xfree86/xf4bpp/emulTile.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: emulTile.c /main/4 1996/02/21 17:56:23 kaleb $ */
/* ppc Tile
* P. Shupak 11/87
diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h
index 1bed6759f..f1d88406d 100644
--- a/hw/xfree86/xf4bpp/ibmTrace.h
+++ b/hw/xfree86/xf4bpp/ibmTrace.h
@@ -1,9 +1 @@
-
-
-
-
-
-/* $XConsortium: ibmTrace.h /main/3 1996/02/21 17:56:27 kaleb $ */
-
#define TRACE(x) /* empty */
-
diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c
index f0c3f7e7b..09d7ee288 100644
--- a/hw/xfree86/xf4bpp/mfbbres.c
+++ b/hw/xfree86/xf4bpp/mfbbres.c
@@ -47,7 +47,6 @@ SOFTWARE.
******************************************************************/
/* GJA -- modified this file for vga16 */
-/* $XConsortium: mfbbres.c /main/5 1996/02/21 17:56:30 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c
index ef800871e..318d4f5da 100644
--- a/hw/xfree86/xf4bpp/mfbbresd.c
+++ b/hw/xfree86/xf4bpp/mfbbresd.c
@@ -46,7 +46,6 @@ SOFTWARE.
******************************************************************/
/* GJA -- modified this file for vga16 */
-/* $XConsortium: mfbbresd.c /main/5 1996/02/21 17:56:34 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c
index 88d4f72d9..d5b5372f5 100644
--- a/hw/xfree86/xf4bpp/mfbfillarc.c
+++ b/hw/xfree86/xf4bpp/mfbfillarc.c
@@ -27,8 +27,6 @@ in this Software without prior written authorization from the X Consortium.
/* GJA -- Took mfb code and modified it. */
-/* $XConsortium: mfbfillarc.c /main/4 1996/02/21 17:56:37 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c
index 82a205e1b..3444f48f5 100644
--- a/hw/xfree86/xf4bpp/mfbhrzvert.c
+++ b/hw/xfree86/xf4bpp/mfbhrzvert.c
@@ -47,7 +47,6 @@ SOFTWARE.
******************************************************************/
/* GJA -- modified this file for vga16 */
-/* $XConsortium: mfbhrzvert.c /main/3 1996/02/21 17:56:41 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c
index b1f0b9f72..bf53f4ce9 100644
--- a/hw/xfree86/xf4bpp/mfbimggblt.c
+++ b/hw/xfree86/xf4bpp/mfbimggblt.c
@@ -1,4 +1,3 @@
-
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbimggblt.c /main/5 1996/02/21 17:56:44 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c
index 82d8bd1c5..d2d4e0b0e 100644
--- a/hw/xfree86/xf4bpp/mfbline.c
+++ b/hw/xfree86/xf4bpp/mfbline.c
@@ -46,7 +46,6 @@ SOFTWARE.
******************************************************************/
/* GJA -- modified this file for vga16 */
-/* $XConsortium: mfbline.c /main/4 1996/02/21 17:56:48 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c
index 921993196..c7a8c4d56 100644
--- a/hw/xfree86/xf4bpp/mfbzerarc.c
+++ b/hw/xfree86/xf4bpp/mfbzerarc.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright (c) 1989 X Consortium
@@ -27,8 +26,6 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
/* GJA -- Took mfb code and modified it. */
-/* $XConsortium: mfbzerarc.c /main/4 1996/02/21 17:56:52 kaleb $ */
-
/* Derived from:
* "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
* by M. L. V. Pitteway
diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c
index 654be829d..3160e7ef8 100644
--- a/hw/xfree86/xf4bpp/offscreen.c
+++ b/hw/xfree86/xf4bpp/offscreen.c
@@ -40,7 +40,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: offscreen.c /main/4 1996/02/21 17:56:55 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c
index 9c693e836..e95696260 100644
--- a/hw/xfree86/xf4bpp/ppcArea.c
+++ b/hw/xfree86/xf4bpp/ppcArea.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: ppcArea.c /main/4 1996/02/21 17:57:02 kaleb $ */
/*
* ppc solid area fill
diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c
index 947602ef3..00c9446de 100644
--- a/hw/xfree86/xf4bpp/ppcBStore.c
+++ b/hw/xfree86/xf4bpp/ppcBStore.c
@@ -59,7 +59,6 @@ used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
*/
-/* $XConsortium: ppcBStore.c /main/5 1996/02/21 17:57:06 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c
index ab46f85ab..c567e6fd1 100644
--- a/hw/xfree86/xf4bpp/ppcCReduce.c
+++ b/hw/xfree86/xf4bpp/ppcCReduce.c
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: ppcCReduce.c /main/3 1996/02/21 17:57:17 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c
index acfd5bd00..899dba683 100644
--- a/hw/xfree86/xf4bpp/ppcClip.c
+++ b/hw/xfree86/xf4bpp/ppcClip.c
@@ -67,7 +67,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: ppcClip.c /main/4 1996/02/21 17:57:21 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index 2242074c1..891ba4b89 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: ppcCpArea.c /main/6 1996/02/21 17:57:24 kaleb $ */
-
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c
index 26a53de86..2fa19ff80 100644
--- a/hw/xfree86/xf4bpp/ppcDepth.c
+++ b/hw/xfree86/xf4bpp/ppcDepth.c
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: ppcDepth.c /main/3 1996/02/21 17:57:31 kaleb $ */
-
/* Check to see if the alleged depth is acceptable for the Screen
*
* T. Paquin 9/87
diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c
index e501f65fb..4be732fb5 100644
--- a/hw/xfree86/xf4bpp/ppcFillRct.c
+++ b/hw/xfree86/xf4bpp/ppcFillRct.c
@@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcFillRct.c /main/5 1996/02/21 17:57:35 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index 81441efd7..b59dab312 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -68,8 +68,6 @@ SOFTWARE.
*/
-/* $XConsortium: ppcGC.c /main/6 1996/02/21 17:57:38 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h
index fd064d1c1..c55a5f9f2 100644
--- a/hw/xfree86/xf4bpp/ppcGCstr.h
+++ b/hw/xfree86/xf4bpp/ppcGCstr.h
@@ -42,7 +42,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcGCstr.h /main/3 1996/02/21 17:57:42 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c
index dc31741f3..d88abe02b 100644
--- a/hw/xfree86/xf4bpp/ppcGetSp.c
+++ b/hw/xfree86/xf4bpp/ppcGetSp.c
@@ -69,8 +69,6 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcGetSp.c /main/5 1996/02/21 17:57:45 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index 0d5afafa5..72793cc6e 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -47,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: ppcIO.c /main/8 1996/02/21 17:57:49 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c
index 6ff7e8fef..3691587ae 100644
--- a/hw/xfree86/xf4bpp/ppcImg.c
+++ b/hw/xfree86/xf4bpp/ppcImg.c
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: ppcImg.c /main/4 1996/02/21 17:57:53 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c
index 08b09e9c7..f24168bb0 100644
--- a/hw/xfree86/xf4bpp/ppcPixFS.c
+++ b/hw/xfree86/xf4bpp/ppcPixFS.c
@@ -43,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcPixFS.c /main/3 1996/02/21 17:57:57 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c
index 9b2defda1..ec181cfaf 100644
--- a/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -68,7 +68,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcPixmap.c /main/5 1996/02/21 17:58:00 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c
index 85ac22e6c..5d7a07e12 100644
--- a/hw/xfree86/xf4bpp/ppcPntWin.c
+++ b/hw/xfree86/xf4bpp/ppcPntWin.c
@@ -68,7 +68,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcPntWin.c /main/5 1996/02/21 17:58:04 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c
index 399ba3bda..1d6905563 100644
--- a/hw/xfree86/xf4bpp/ppcPolyPnt.c
+++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c
@@ -67,7 +67,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: ppcPolyPnt.c /main/5 1996/02/21 17:58:07 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c
index 810b81f24..d42360da5 100644
--- a/hw/xfree86/xf4bpp/ppcQuery.c
+++ b/hw/xfree86/xf4bpp/ppcQuery.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: ppcQuery.c /main/3 1996/02/21 17:58:18 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c
index e4601e2af..0337feb62 100644
--- a/hw/xfree86/xf4bpp/ppcRslvC.c
+++ b/hw/xfree86/xf4bpp/ppcRslvC.c
@@ -50,8 +50,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: ppcRslvC.c /main/7 1996/02/21 17:58:25 kaleb $ */
-
/* Generic Color Resolution Scheme
* P. Shupak 12/31/87
*/
diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c
index 350cb9b14..7659384e7 100644
--- a/hw/xfree86/xf4bpp/ppcSetSp.c
+++ b/hw/xfree86/xf4bpp/ppcSetSp.c
@@ -68,7 +68,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcSetSp.c /main/5 1996/02/21 17:58:32 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h
index 41245ceb3..2b7f951d4 100644
--- a/hw/xfree86/xf4bpp/ppcSpMcro.h
+++ b/hw/xfree86/xf4bpp/ppcSpMcro.h
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: ppcSpMcro.h /main/3 1996/02/21 17:58:36 kaleb $ */
/* This screwy macro is used in all the spans routines and you find
it all over the place, so it is a macro just to tidy things up.
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index bd9b1289f..e19ce0d40 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -43,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ppcWinFS.c /main/3 1996/02/21 17:58:39 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c
index 11c5e343e..01768d9ff 100644
--- a/hw/xfree86/xf4bpp/ppcWindow.c
+++ b/hw/xfree86/xf4bpp/ppcWindow.c
@@ -67,7 +67,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: ppcWindow.c /main/5 1996/02/21 17:58:43 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c
index e51e0dc1a..2e89f43b7 100644
--- a/hw/xfree86/xf4bpp/vgaBitBlt.c
+++ b/hw/xfree86/xf4bpp/vgaBitBlt.c
@@ -1,9 +1,5 @@
/* GJA -- span move routines */
-
-
-/* $XConsortium: vgaBitBlt.c /main/8 1996/10/27 11:06:39 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c
index fd33727b9..5a8604090 100644
--- a/hw/xfree86/xf4bpp/vgaGC.c
+++ b/hw/xfree86/xf4bpp/vgaGC.c
@@ -68,8 +68,6 @@ SOFTWARE.
*/
-/* $XConsortium: vgaGC.c /main/6 1996/02/21 17:58:54 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c
index 22f8d8f8e..bea2d0a17 100644
--- a/hw/xfree86/xf4bpp/vgaImages.c
+++ b/hw/xfree86/xf4bpp/vgaImages.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: vgaImages.c /main/5 1996/02/21 17:58:58 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h
index c5165256c..32ec0daed 100644
--- a/hw/xfree86/xf4bpp/vgaReg.h
+++ b/hw/xfree86/xf4bpp/vgaReg.h
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: vgaReg.h /main/4 1996/02/21 17:59:02 kaleb $ */
-
#define SET_BYTE_REGISTER( ioport, value ) outb( ioport, value )
#define SET_INDEX_REGISTER( ioport, value ) SET_BYTE_REGISTER( ioport, value )
#define SET_DATA_REGISTER( ioport, value ) SET_BYTE_REGISTER( ioport, value )
diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c
index 562b1ebc4..501bd3db0 100644
--- a/hw/xfree86/xf4bpp/vgaSolid.c
+++ b/hw/xfree86/xf4bpp/vgaSolid.c
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: vgaSolid.c /main/5 1996/02/21 17:59:06 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c
index b81305bd4..5ad53028c 100644
--- a/hw/xfree86/xf4bpp/vgaStipple.c
+++ b/hw/xfree86/xf4bpp/vgaStipple.c
@@ -20,7 +20,6 @@
* SOFTWARE.
*
*/
-/* $XConsortium: vgaStipple.c /main/5 1996/02/21 17:59:10 kaleb $ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h
index 14e85ef79..60afa5bb6 100644
--- a/hw/xfree86/xf4bpp/vgaVideo.h
+++ b/hw/xfree86/xf4bpp/vgaVideo.h
@@ -21,8 +21,6 @@
*
*/
-/* $XConsortium: vgaVideo.h /main/4 1996/02/21 17:59:14 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c
index 24ecf3dd2..3a57221f2 100644
--- a/hw/xfree86/xf4bpp/wm3.c
+++ b/hw/xfree86/xf4bpp/wm3.c
@@ -1,10 +1,3 @@
-
-
-
-
-
-/* $XConsortium: wm3.c /main/5 1996/02/21 17:59:21 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h
index 2d66557fc..113723283 100644
--- a/hw/xfree86/xf4bpp/wm3.h
+++ b/hw/xfree86/xf4bpp/wm3.h
@@ -1,10 +1,3 @@
-
-
-
-
-
-/* $XConsortium: wm3.h /main/4 1996/02/21 17:59:24 kaleb $ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c
index 011b9e763..e10b52525 100644
--- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c
+++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
index 3d1af095a..f009afc0c 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xgl/egl/evdev.c b/hw/xgl/egl/evdev.c
index ebfe265a3..fff4524d1 100644
--- a/hw/xgl/egl/evdev.c
+++ b/hw/xgl/egl/evdev.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/hw/xgl/egl/kinput.c b/hw/xgl/egl/kinput.c
index 5fd23f568..981cffcfa 100644
--- a/hw/xgl/egl/kinput.c
+++ b/hw/xgl/egl/kinput.c
@@ -1,6 +1,4 @@
/*
- * Id: kinput.c,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */
#include <xgl-config.h>
diff --git a/hw/xgl/egl/kkeymap.h b/hw/xgl/egl/kkeymap.h
index 9a21d3597..920e807e5 100644
--- a/hw/xgl/egl/kkeymap.h
+++ b/hw/xgl/egl/kkeymap.h
@@ -1,6 +1,4 @@
/*
- * Id: kkeymap.h,v 1.1 1999/11/02 03:54:46 keithp Exp $
- *
* Copyright 1999 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -21,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */
/*
* All global variables and functions pertaining to keyboard key mapping
* live in this header file.
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index c2e8b0db7..f061f9e80 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h>
diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h
index 38090fd0e..c3002bfca 100644
--- a/hw/xnest/Args.h
+++ b/hw/xnest/Args.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTARGC_H
#define XNESTARGS_H
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index 2dd60971f..5ba0bdbad 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h>
diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h
index aec0a248c..f00bde47f 100644
--- a/hw/xnest/Color.h
+++ b/hw/xnest/Color.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTCOLOR_H
#define XNESTCOLOR_H
diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h
index 61159c9ba..d94916ecd 100644
--- a/hw/xnest/Drawable.h
+++ b/hw/xnest/Drawable.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTDRAWABLE_H
#define XNESTDRAWABLE_H
diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h
index cdad9f398..2441accd5 100644
--- a/hw/xnest/Events.h
+++ b/hw/xnest/Events.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTEVENTS_H
#define XNESTEVENTS_H
diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h
index fce9d6cb3..ca4cf33f7 100644
--- a/hw/xnest/GCOps.h
+++ b/hw/xnest/GCOps.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTGCOPS_H
#define XNESTGCOPS_H
diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h
index fe064213e..16228a0c1 100644
--- a/hw/xnest/Handlers.h
+++ b/hw/xnest/Handlers.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTHANDLERS_H
#define XNESTHANDLERS_H
diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h
index d87866c73..546a1cbe4 100644
--- a/hw/xnest/Keyboard.h
+++ b/hw/xnest/Keyboard.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTKEYBOARD_H
#define XNESTKEYBOARD_H
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 912b6fa21..b0de13b5f 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h>
diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h
index 2012db4c3..890726f55 100644
--- a/hw/xnest/Pointer.h
+++ b/hw/xnest/Pointer.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTPOINTER_H
#define XNESTPOINTER_H
diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h
index db298e300..b113c6460 100644
--- a/hw/xnest/Screen.h
+++ b/hw/xnest/Screen.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTSCREEN_H
#define XNESTSCREEN_H
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index 628e22a7d..da1d63c10 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h>
diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h
index c2d715a65..1bd203709 100644
--- a/hw/xnest/Visual.h
+++ b/hw/xnest/Visual.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTVISUAL_H
#define XNESTVISUAL_H
diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h
index f7b9e38c0..92c112f36 100644
--- a/hw/xnest/XNFont.h
+++ b/hw/xnest/XNFont.h
@@ -11,8 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
-
#ifndef XNESTFONT_H
#define XNESTFONT_H
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index a59508739..d3ac3df0b 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86$ */
#ifndef XNESTGC_H
#define XNESTGC_H
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
index 8ed3f8902..827030c8f 100644
--- a/hw/xnest/Xnest.h
+++ b/hw/xnest/Xnest.h
@@ -27,7 +27,6 @@ other dealings in this Software without prior written authorization
from the X Consortium.
*/
-/* $XFree86$ */
/*
** Machines with a 64 bit library interface and a 32 bit server require
diff --git a/hw/xprint/ValTree.c b/hw/xprint/ValTree.c
index 60e340dc1..5f58de7ec 100644
--- a/hw/xprint/ValTree.c
+++ b/hw/xprint/ValTree.c
@@ -29,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from said
copyright holders.
*/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/hw/xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c
index 716c48d6d..9e993f79c 100644
--- a/hw/xprint/pcl/PclFonts.c
+++ b/hw/xprint/pcl/PclFonts.c
@@ -12,7 +12,6 @@
** *********************************************************
**
********************************************************************/
-/* $XFree86$ */
/*
(c) Copyright 1996 Hewlett-Packard Company
(c) Copyright 1996 International Business Machines Corp.
diff --git a/hw/xprint/spooler.c b/hw/xprint/spooler.c
index e3022b0c4..69b5eed0e 100644
--- a/hw/xprint/spooler.c
+++ b/hw/xprint/spooler.c
@@ -1,4 +1,3 @@
-
/*
Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org>
Copyright (c) 2004 Sun Microsystems, Inc.
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 52f837ede..6a850cd44 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -1,4 +1,3 @@
-/* $TOG: InitInput.c /main/12 1998/02/10 13:23:52 kaleb $ */
/*
Copyright 1993, 1998 The Open Group
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 9457c9cc7..f966d4026 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -1,4 +1,3 @@
-/* $TOG: InitOutput.c /main/20 1998/02/10 13:23:56 kaleb $ */
/*
Copyright 1993, 1998 The Open Group
diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
index 0bb7aef4f..2eb7c2674 100644
--- a/hw/xwin/ddraw.h
+++ b/hw/xwin/ddraw.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
#ifndef __XWIN_DDRAW_H
#define __XWIN_DDRAW_H
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index 8b7702501..8fd9841d7 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -29,7 +29,6 @@
*
* Authors: Alexander Gottwald
*/
-/* $Id$ */
#include "win.h"
#ifdef XWIN_XF86CONFIG
diff --git a/hw/xwin/winkeymap.h b/hw/xwin/winkeymap.h
index 0c633cdfc..3862f0379 100644
--- a/hw/xwin/winkeymap.h
+++ b/hw/xwin/winkeymap.h
@@ -3,7 +3,6 @@
* For Scancodes see notes in winkeynames.h !!!!
*
*/
-/* $XConsortium: xf86Keymap.h /main/14 1996/02/21 17:38:47 kaleb $ */
static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = {
/* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol,
diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h
index 6d480a3f9..7c16337de 100644
--- a/hw/xwin/winkeynames.h
+++ b/hw/xwin/winkeynames.h
@@ -22,7 +22,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */
#define XK_TECHNICAL
#define XK_KATAKANA
diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c
index 53974101e..d0464f71b 100644
--- a/hw/xwin/winmsg.c
+++ b/hw/xwin/winmsg.c
@@ -27,7 +27,6 @@
*
* Authors: Alexander Gottwald
*/
-/* $XFree86$ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h
index 367086c78..611dd6962 100644
--- a/hw/xwin/winmsg.h
+++ b/hw/xwin/winmsg.h
@@ -29,8 +29,6 @@
*
* Authors: Alexander Gottwald
*/
-/* $XFree86$ */
-
/*
* Function prototypes
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c
index 57c434669..5b47c3976 100755
--- a/hw/xwin/winmultiwindowclass.c
+++ b/hw/xwin/winmultiwindowclass.c
@@ -27,7 +27,6 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86$ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h
index 0b430f2f8..c635ab20b 100755
--- a/hw/xwin/winmultiwindowclass.h
+++ b/hw/xwin/winmultiwindowclass.h
@@ -29,8 +29,6 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86$ */
-
/*
* Structures
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 0541f785f..30e587d4a 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -27,7 +27,6 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: $ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index 2e58e5e9d..d9e09deea 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -29,7 +29,6 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: $ */
/* Need Bool */
#include <X11/Xdefs.h>
diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c
index 110292989..f4818920a 100644
--- a/hw/xwin/winrop.c
+++ b/hw/xwin/winrop.c
@@ -27,7 +27,6 @@
*
* Authors: Alan Hourihane <alanh@fairlite.demon.co.uk>
*/
-/* $XFree86$ */
/*
* Raster operations used by Windows translated to X's 16 rop codes...
diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c
index bf7305c9c..054a8e956 100755
--- a/hw/xwin/wintrayicon.c
+++ b/hw/xwin/wintrayicon.c
@@ -28,7 +28,6 @@
* Authors: Early Ehlinger
* Harold L Hunt II
*/
-/* $XFree86: $ */
#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
diff --git a/include/pixmap.h b/include/pixmap.h
index 19e682a50..5ff0b8c16 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86$ */
#ifndef PIXMAP_H
#define PIXMAP_H
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 93bd45db8..459488226 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86$ */
#ifndef PIXMAPSTRUCT_H
#define PIXMAPSTRUCT_H
diff --git a/include/window.h b/include/window.h
index cd8c5b283..312b75e88 100644
--- a/include/window.h
+++ b/include/window.h
@@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86$ */
#ifndef WINDOW_H
#define WINDOW_H
diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c
index f65f45ebd..b138d5805 100644
--- a/mfb/mfbwindow.c
+++ b/mfb/mfbwindow.c
@@ -45,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/mi/mipoly.c b/mi/mipoly.c
index ea0406f88..4c77fc268 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mistruct.h b/mi/mistruct.h
index 9b9de8677..e9cfed5a4 100644
--- a/mi/mistruct.h
+++ b/mi/mistruct.h
@@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86$ */
#ifndef MISTRUCT_H
#define MISTRUCT_H
diff --git a/mi/mivalidate.h b/mi/mivalidate.h
index 91858328a..ef258c0f8 100644
--- a/mi/mivalidate.h
+++ b/mi/mivalidate.h
@@ -25,8 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86$ */
-
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/miext/cw/cw.c b/miext/cw/cw.c
index 69502711a..7ee013be1 100644
--- a/miext/cw/cw.c
+++ b/miext/cw/cw.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/miext/cw/cw.h b/miext/cw/cw.h
index 69abbbfed..0d57b9b9d 100644
--- a/miext/cw/cw.h
+++ b/miext/cw/cw.h
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c
index 82ec99999..9ae56cb6c 100644
--- a/miext/cw/cw_ops.c
+++ b/miext/cw/cw_ops.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c
index beb906081..35416beb7 100644
--- a/miext/cw/cw_render.c
+++ b/miext/cw/cw_render.c
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Header$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index d93074758..2acff11e8 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/damage/damage.h b/miext/damage/damage.h
index 36a06545f..4cfc8127d 100755
--- a/miext/damage/damage.h
+++ b/miext/damage/damage.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 83a202ba8..58ee2bb38 100755
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index b4a739ba4..f624216db 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c
index 5c01f2aac..72aa28b14 100644
--- a/miext/shadow/shalloc.c
+++ b/miext/shadow/shalloc.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c
index 2ec41bb07..0b7faca6a 100644
--- a/miext/shadow/shrot16pack.c
+++ b/miext/shadow/shrot16pack.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c
index 06b1603ba..d8f2633e5 100644
--- a/miext/shadow/shrot16pack_180.c
+++ b/miext/shadow/shrot16pack_180.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c
index 1ad952ec6..4aa471325 100644
--- a/miext/shadow/shrot16pack_270.c
+++ b/miext/shadow/shrot16pack_270.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot16pack_270YX.c b/miext/shadow/shrot16pack_270YX.c
index 3a3dfa8a3..0df1fd51f 100644
--- a/miext/shadow/shrot16pack_270YX.c
+++ b/miext/shadow/shrot16pack_270YX.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c
index cfef7785c..81e49151a 100644
--- a/miext/shadow/shrot16pack_90.c
+++ b/miext/shadow/shrot16pack_90.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot16pack_90YX.c b/miext/shadow/shrot16pack_90YX.c
index 2eb721581..5fc3b236a 100644
--- a/miext/shadow/shrot16pack_90YX.c
+++ b/miext/shadow/shrot16pack_90YX.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c
index 95c7c292c..4a9cbc0ff 100644
--- a/miext/shadow/shrot32pack.c
+++ b/miext/shadow/shrot32pack.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c
index cbadba59d..8f5fb5760 100644
--- a/miext/shadow/shrot32pack_180.c
+++ b/miext/shadow/shrot32pack_180.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c
index 8f434b08e..7d52fd2bf 100644
--- a/miext/shadow/shrot32pack_270.c
+++ b/miext/shadow/shrot32pack_270.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c
index 98c22c37d..0abeb5cdd 100644
--- a/miext/shadow/shrot32pack_90.c
+++ b/miext/shadow/shrot32pack_90.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c
index 9e77f43e8..552d838f3 100644
--- a/miext/shadow/shrot8pack.c
+++ b/miext/shadow/shrot8pack.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c
index 6f4eca93e..526d8f15f 100644
--- a/miext/shadow/shrot8pack_180.c
+++ b/miext/shadow/shrot8pack_180.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c
index d56a3366c..73f82a712 100644
--- a/miext/shadow/shrot8pack_270.c
+++ b/miext/shadow/shrot8pack_270.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c
index 2fed8126d..73060cad1 100644
--- a/miext/shadow/shrot8pack_90.c
+++ b/miext/shadow/shrot8pack_90.c
@@ -1,6 +1,4 @@
/*
- * $XFree86$
- *
* Copyright © 2000 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/miext/shadow/shrotpackYX.h b/miext/shadow/shrotpackYX.h
index f51da2f65..8ef70f167 100644
--- a/miext/shadow/shrotpackYX.h
+++ b/miext/shadow/shrotpackYX.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Philip Blundell
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/os/strlcat.c b/os/strlcat.c
index 28e2338f9..b57fcc563 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -1,5 +1,3 @@
-/* $OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $ */
-
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
*
@@ -15,7 +13,6 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86$ */
#ifdef HAVE_XORG_CONFIG_H
diff --git a/os/strlcpy.c b/os/strlcpy.c
index 42442cc30..989d0385e 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -1,5 +1,3 @@
-/* $OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $ */
-
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
*
@@ -15,7 +13,6 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86$ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
diff --git a/record/set.h b/record/set.h
index f156bf8dc..3246a16ed 100644
--- a/record/set.h
+++ b/record/set.h
@@ -1,4 +1,3 @@
-
/*
Copyright 1995, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86$ */
/*
A Set Abstract Data Type (ADT) for the RECORD Extension
diff --git a/render/filter.c b/render/filter.c
index 71375dae9..092313f6e 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/render/picturestr.h b/render/picturestr.h
index 06530e260..01572ec48 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2000 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/render/renderedge.c b/render/renderedge.c
index e92174f90..d0ee30716 100644
--- a/render/renderedge.c
+++ b/render/renderedge.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/render/renderedge.h b/render/renderedge.h
index 38f9f0914..644d9d9e5 100644
--- a/render/renderedge.h
+++ b/render/renderedge.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2004 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 3cdacc0e4..401c403c8 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/region.c b/xfixes/region.c
index 91e9fc9c1..d4316be78 100755
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index ab75619e8..8d66843d9 100755
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/select.c b/xfixes/select.c
index f0a9f2f4f..c0076801d 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index 0f1e3b070..81dd83daf 100755
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 7f3b119b7..48927ae0f 100755
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c
index 77222236f..8144fd2c5 100644
--- a/xkb/ddxFakeBtn.c
+++ b/xkb/ddxFakeBtn.c
@@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index 3bcf9d604..4c78a621b 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index 685ae1b42..f48296dbc 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index 22899d766..b4c8086f5 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index f84e70995..a2ea0909a 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index bdec8e7d3..8905ef4d3 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 3a5037150..4983e2b9e 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -1,4 +1,3 @@
-/* $Xorg: xkbtext.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>