summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GL/apple/aglGlx.c2
-rw-r--r--GL/apple/indirect.c2
-rw-r--r--GL/glx/g_disptab.c2
-rw-r--r--GL/glx/g_disptab.h2
-rw-r--r--GL/glx/g_disptab_EXT.c2
-rw-r--r--GL/glx/g_disptab_EXT.h2
-rw-r--r--GL/glx/g_render.c2
-rw-r--r--GL/glx/g_renderswap.c2
-rw-r--r--GL/glx/g_single.c2
-rw-r--r--GL/glx/g_singleswap.c2
-rw-r--r--GL/glx/global.c2
-rw-r--r--GL/glx/glxbuf.c2
-rw-r--r--GL/glx/glxbuf.h2
-rw-r--r--GL/glx/glxcmds.c2
-rw-r--r--GL/glx/glxcmdsswap.c2
-rw-r--r--GL/glx/glxcontext.h2
-rw-r--r--GL/glx/glxdrawable.h2
-rw-r--r--GL/glx/glxerror.h2
-rw-r--r--GL/glx/glxext.c2
-rw-r--r--GL/glx/glxext.h2
-rw-r--r--GL/glx/glxfb.c2
-rw-r--r--GL/glx/glxfb.h2
-rw-r--r--GL/glx/glximports.c2
-rw-r--r--GL/glx/glximports.h2
-rw-r--r--GL/glx/glxmem.c2
-rw-r--r--GL/glx/glxmem.h2
-rw-r--r--GL/glx/glxpix.c2
-rw-r--r--GL/glx/glxpix.h2
-rw-r--r--GL/glx/glxscreens.c2
-rw-r--r--GL/glx/glxscreens.h2
-rw-r--r--GL/glx/glxserver.h2
-rw-r--r--GL/glx/glxutil.c2
-rw-r--r--GL/glx/glxutil.h2
-rw-r--r--GL/glx/impsize.h2
-rw-r--r--GL/glx/render2.c2
-rw-r--r--GL/glx/render2swap.c2
-rw-r--r--GL/glx/renderpix.c2
-rw-r--r--GL/glx/renderpixswap.c2
-rw-r--r--GL/glx/rensize.c2
-rw-r--r--GL/glx/rensizetab.c2
-rw-r--r--GL/glx/single2.c2
-rw-r--r--GL/glx/single2swap.c2
-rw-r--r--GL/glx/singlepix.c2
-rw-r--r--GL/glx/singlepixswap.c2
-rw-r--r--GL/glx/singlesize.c2
-rw-r--r--GL/glx/singlesize.h2
-rw-r--r--GL/glx/unpack.h2
-rw-r--r--GL/glx/xfont.c2
-rw-r--r--GL/include/GL/glx_ansic.h2
-rw-r--r--GL/include/GL/xf86glx.h2
-rw-r--r--XTrap/xtrapddmi.c2
-rw-r--r--XTrap/xtrapdi.c2
-rw-r--r--XTrap/xtrapdiswp.c2
-rw-r--r--XTrap/xtrapditbl.c2
-rw-r--r--Xext/EVI.c2
-rw-r--r--Xext/EVIstruct.h2
-rw-r--r--Xext/appgroup.c2
-rw-r--r--Xext/appgroup.h2
-rw-r--r--Xext/bigreq.c2
-rw-r--r--Xext/cup.c2
-rw-r--r--Xext/dpms.c2
-rw-r--r--Xext/dpmsproc.h2
-rw-r--r--Xext/dpmsstubs.c2
-rw-r--r--Xext/fontcache.c2
-rw-r--r--Xext/mbuf.c2
-rw-r--r--Xext/mbufbf.c2
-rw-r--r--Xext/mbufpx.c2
-rw-r--r--Xext/mitmisc.c2
-rw-r--r--Xext/panoramiX.c2
-rw-r--r--Xext/panoramiX.h2
-rw-r--r--Xext/panoramiXSwap.c2
-rw-r--r--Xext/panoramiXh.h2
-rw-r--r--Xext/panoramiXprocs.c2
-rw-r--r--Xext/panoramiXsrv.h2
-rw-r--r--Xext/sampleEVI.c2
-rw-r--r--Xext/saver.c2
-rw-r--r--Xext/security.c2
-rw-r--r--Xext/shape.c2
-rw-r--r--Xext/shm.c2
-rw-r--r--Xext/sleepuntil.c2
-rw-r--r--Xext/sync.c2
-rw-r--r--Xext/xcmisc.c2
-rw-r--r--Xext/xf86bigfont.c2
-rw-r--r--Xext/xprint.c2
-rw-r--r--Xext/xres.c2
-rw-r--r--Xext/xtest.c2
-rw-r--r--Xext/xtest1dd.c2
-rw-r--r--Xext/xtest1dd.h2
-rw-r--r--Xext/xtest1di.c2
-rw-r--r--Xext/xvdisp.c2
-rw-r--r--Xext/xvdisp.h2
-rw-r--r--Xext/xvdix.h2
-rw-r--r--Xext/xvmain.c2
-rw-r--r--Xext/xvmc.c2
-rw-r--r--Xext/xvmcext.h2
-rw-r--r--Xi/allowev.c2
-rw-r--r--Xi/allowev.h2
-rw-r--r--Xi/chgdctl.c2
-rw-r--r--Xi/chgdctl.h2
-rw-r--r--Xi/chgfctl.c2
-rw-r--r--Xi/chgfctl.h2
-rw-r--r--Xi/chgkbd.c2
-rw-r--r--Xi/chgkbd.h2
-rw-r--r--Xi/chgkmap.c2
-rw-r--r--Xi/chgkmap.h2
-rw-r--r--Xi/chgprop.c2
-rw-r--r--Xi/chgprop.h2
-rw-r--r--Xi/chgptr.c2
-rw-r--r--Xi/chgptr.h2
-rw-r--r--Xi/closedev.c2
-rw-r--r--Xi/closedev.h2
-rw-r--r--Xi/devbell.c2
-rw-r--r--Xi/devbell.h2
-rw-r--r--Xi/exevents.c2
-rw-r--r--Xi/exglobals.h2
-rw-r--r--Xi/extinit.c2
-rw-r--r--Xi/getbmap.c2
-rw-r--r--Xi/getbmap.h2
-rw-r--r--Xi/getdctl.c2
-rw-r--r--Xi/getdctl.h2
-rw-r--r--Xi/getfctl.c2
-rw-r--r--Xi/getfctl.h2
-rw-r--r--Xi/getfocus.c2
-rw-r--r--Xi/getfocus.h2
-rw-r--r--Xi/getkmap.c2
-rw-r--r--Xi/getkmap.h2
-rw-r--r--Xi/getmmap.c2
-rw-r--r--Xi/getmmap.h2
-rw-r--r--Xi/getprop.c2
-rw-r--r--Xi/getprop.h2
-rw-r--r--Xi/getselev.c2
-rw-r--r--Xi/getselev.h2
-rw-r--r--Xi/getvers.c2
-rw-r--r--Xi/getvers.h2
-rw-r--r--Xi/grabdev.c2
-rw-r--r--Xi/grabdev.h2
-rw-r--r--Xi/grabdevb.c2
-rw-r--r--Xi/grabdevb.h2
-rw-r--r--Xi/grabdevk.c2
-rw-r--r--Xi/grabdevk.h2
-rw-r--r--Xi/gtmotion.c2
-rw-r--r--Xi/gtmotion.h2
-rw-r--r--Xi/listdev.c2
-rw-r--r--Xi/listdev.h2
-rw-r--r--Xi/opendev.c2
-rw-r--r--Xi/opendev.h2
-rw-r--r--Xi/queryst.c2
-rw-r--r--Xi/queryst.h2
-rw-r--r--Xi/selectev.c2
-rw-r--r--Xi/selectev.h2
-rw-r--r--Xi/sendexev.c2
-rw-r--r--Xi/sendexev.h2
-rw-r--r--Xi/setbmap.c2
-rw-r--r--Xi/setbmap.h2
-rw-r--r--Xi/setdval.c2
-rw-r--r--Xi/setdval.h2
-rw-r--r--Xi/setfocus.c2
-rw-r--r--Xi/setfocus.h2
-rw-r--r--Xi/setmmap.c2
-rw-r--r--Xi/setmmap.h2
-rw-r--r--Xi/setmode.c2
-rw-r--r--Xi/setmode.h2
-rw-r--r--Xi/stubs.c2
-rw-r--r--Xi/ungrdev.c2
-rw-r--r--Xi/ungrdev.h2
-rw-r--r--Xi/ungrdevb.c2
-rw-r--r--Xi/ungrdevb.h2
-rw-r--r--Xi/ungrdevk.c2
-rw-r--r--Xi/ungrdevk.h2
-rw-r--r--Xprint/AttrValid.c2
-rw-r--r--Xprint/AttrValid.h2
-rw-r--r--Xprint/DiPrint.h2
-rw-r--r--Xprint/Init.c2
-rw-r--r--Xprint/Oid.c2
-rw-r--r--Xprint/Oid.h2
-rw-r--r--Xprint/OidStrs.h2
-rw-r--r--Xprint/Util.c2
-rw-r--r--Xprint/ValTree.c2
-rw-r--r--Xprint/attributes.c2
-rw-r--r--Xprint/attributes.h2
-rw-r--r--Xprint/ddxInit.c2
-rw-r--r--Xprint/mediaSizes.c2
-rw-r--r--Xprint/pcl/Pcl.h2
-rw-r--r--Xprint/pcl/PclArc.c2
-rw-r--r--Xprint/pcl/PclArea.c2
-rw-r--r--Xprint/pcl/PclColor.c2
-rw-r--r--Xprint/pcl/PclCursor.c2
-rw-r--r--Xprint/pcl/PclFonts.c2
-rw-r--r--Xprint/pcl/PclGC.c2
-rw-r--r--Xprint/pcl/PclInit.c2
-rw-r--r--Xprint/pcl/PclLine.c2
-rw-r--r--Xprint/pcl/PclMisc.c2
-rw-r--r--Xprint/pcl/PclPixel.c2
-rw-r--r--Xprint/pcl/PclPixmap.c2
-rw-r--r--Xprint/pcl/PclPolygon.c2
-rw-r--r--Xprint/pcl/PclPrint.c2
-rw-r--r--Xprint/pcl/PclSFonts.c2
-rw-r--r--Xprint/pcl/PclSpans.c2
-rw-r--r--Xprint/pcl/PclText.c2
-rw-r--r--Xprint/pcl/PclWindow.c2
-rw-r--r--Xprint/pcl/Pclmap.h2
-rw-r--r--Xprint/ps/Ps.h2
-rw-r--r--Xprint/ps/PsAttVal.c2
-rw-r--r--Xprint/ps/PsAttr.c2
-rw-r--r--Xprint/ps/PsColor.c2
-rw-r--r--Xprint/ps/PsFonts.c2
-rw-r--r--Xprint/ps/PsGC.c2
-rw-r--r--Xprint/ps/PsInit.c2
-rw-r--r--Xprint/ps/PsLine.c2
-rw-r--r--Xprint/ps/PsMisc.c2
-rw-r--r--Xprint/ps/PsPixel.c2
-rw-r--r--Xprint/ps/PsPixmap.c2
-rw-r--r--Xprint/ps/PsPolygon.c2
-rw-r--r--Xprint/ps/PsPrint.c2
-rw-r--r--Xprint/ps/PsSpans.c2
-rw-r--r--Xprint/ps/PsText.c2
-rw-r--r--Xprint/ps/PsWindow.c2
-rw-r--r--Xprint/ps/psout.c2
-rw-r--r--Xprint/ps/psout.h2
-rw-r--r--Xprint/raster/Raster.c2
-rw-r--r--Xprint/raster/Raster.h2
-rw-r--r--Xprint/raster/RasterAttVal.c2
-rw-r--r--afb/afb.h2
-rw-r--r--afb/afbbitblt.c2
-rw-r--r--afb/afbblt.c2
-rw-r--r--afb/afbbres.c2
-rw-r--r--afb/afbbresd.c2
-rw-r--r--afb/afbbstore.c2
-rw-r--r--afb/afbclip.c2
-rw-r--r--afb/afbcmap.c2
-rw-r--r--afb/afbfillarc.c2
-rw-r--r--afb/afbfillrct.c2
-rw-r--r--afb/afbfillsp.c2
-rw-r--r--afb/afbfont.c2
-rw-r--r--afb/afbgc.c2
-rw-r--r--afb/afbgetsp.c2
-rw-r--r--afb/afbhrzvert.c2
-rw-r--r--afb/afbimage.c2
-rw-r--r--afb/afbimggblt.c2
-rw-r--r--afb/afbline.c2
-rw-r--r--afb/afbmisc.c2
-rw-r--r--afb/afbpixmap.c2
-rw-r--r--afb/afbply1rct.c2
-rw-r--r--afb/afbplygblt.c2
-rw-r--r--afb/afbpntarea.c2
-rw-r--r--afb/afbpntwin.c2
-rw-r--r--afb/afbpolypnt.c2
-rw-r--r--afb/afbpushpxl.c2
-rw-r--r--afb/afbscrinit.c2
-rw-r--r--afb/afbsetsp.c2
-rw-r--r--afb/afbtegblt.c2
-rw-r--r--afb/afbtile.c2
-rw-r--r--afb/afbwindow.c2
-rw-r--r--afb/afbzerarc.c2
-rw-r--r--cfb/cfb.h2
-rw-r--r--cfb/cfb8bit.c2
-rw-r--r--cfb/cfb8bit.h2
-rw-r--r--cfb/cfb8line.c2
-rw-r--r--cfb/cfballpriv.c2
-rw-r--r--cfb/cfbbitblt.c2
-rw-r--r--cfb/cfbblt.c2
-rw-r--r--cfb/cfbbres.c2
-rw-r--r--cfb/cfbbresd.c2
-rw-r--r--cfb/cfbbstore.c2
-rw-r--r--cfb/cfbcmap.c2
-rw-r--r--cfb/cfbcppl.c2
-rw-r--r--cfb/cfbfillarc.c2
-rw-r--r--cfb/cfbfillrct.c2
-rw-r--r--cfb/cfbfillsp.c2
-rw-r--r--cfb/cfbgc.c2
-rw-r--r--cfb/cfbgetsp.c2
-rw-r--r--cfb/cfbglblt8.c2
-rw-r--r--cfb/cfbhrzvert.c2
-rw-r--r--cfb/cfbigblt8.c2
-rw-r--r--cfb/cfbimage.c2
-rw-r--r--cfb/cfbline.c2
-rw-r--r--cfb/cfbmap.h2
-rw-r--r--cfb/cfbmskbits.c2
-rw-r--r--cfb/cfbmskbits.h2
-rw-r--r--cfb/cfbpixmap.c2
-rw-r--r--cfb/cfbply1rct.c2
-rw-r--r--cfb/cfbpntwin.c2
-rw-r--r--cfb/cfbpolypnt.c2
-rw-r--r--cfb/cfbpush8.c2
-rw-r--r--cfb/cfbrctstp8.c2
-rw-r--r--cfb/cfbrrop.c2
-rw-r--r--cfb/cfbrrop.h2
-rw-r--r--cfb/cfbscrinit.c2
-rw-r--r--cfb/cfbsetsp.c2
-rw-r--r--cfb/cfbsolid.c2
-rw-r--r--cfb/cfbtab.h2
-rw-r--r--cfb/cfbteblt8.c2
-rw-r--r--cfb/cfbtegblt.c2
-rw-r--r--cfb/cfbtile32.c2
-rw-r--r--cfb/cfbtileodd.c2
-rw-r--r--cfb/cfbwindow.c2
-rw-r--r--cfb/cfbzerarc.c2
-rw-r--r--cfb/stip68kgnu.h2
-rw-r--r--cfb/stipsparc.s2
-rw-r--r--cfb/stipsprc32.s2
-rw-r--r--cfb24/cfbrrop24.h2
-rw-r--r--dbe/dbe.c2
-rw-r--r--dbe/dbestruct.h2
-rw-r--r--dbe/midbe.c2
-rw-r--r--dbe/midbe.h2
-rw-r--r--dix/atom.c2
-rw-r--r--dix/colormap.c2
-rw-r--r--dix/cursor.c2
-rw-r--r--dix/devices.c2
-rw-r--r--dix/dispatch.c2
-rw-r--r--dix/dispatch.h2
-rw-r--r--dix/dixfonts.c2
-rw-r--r--dix/dixutils.c2
-rw-r--r--dix/events.c2
-rw-r--r--dix/extension.c2
-rw-r--r--dix/gc.c2
-rw-r--r--dix/globals.c2
-rw-r--r--dix/grabs.c2
-rw-r--r--dix/main.c2
-rw-r--r--dix/pixmap.c2
-rw-r--r--dix/privates.c2
-rw-r--r--dix/property.c2
-rw-r--r--dix/resource.c2
-rw-r--r--dix/swaprep.c2
-rw-r--r--dix/swapreq.c2
-rw-r--r--dix/tables.c2
-rw-r--r--dix/window.c2
-rw-r--r--dix/xpstubs.c2
-rw-r--r--doc/Xserver.man.pre2
-rw-r--r--doc/smartsched2
-rw-r--r--fb/fb.h2
-rw-r--r--fb/fb24_32.c2
-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/fbcmap.c2
-rw-r--r--fb/fbcompose.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/fbglyph.c2
-rw-r--r--fb/fbimage.c2
-rw-r--r--fb/fbline.c2
-rw-r--r--fb/fboverlay.c2
-rw-r--r--fb/fboverlay.h2
-rw-r--r--fb/fbpict.c2
-rw-r--r--fb/fbpict.h2
-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/fbscreen.c2
-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/XDarwin.man2
-rw-r--r--hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp2
-rw-r--r--hw/darwin/bundle/English.lproj/Localizable.strings2
-rw-r--r--hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp2
-rw-r--r--hw/darwin/bundle/startXClients.cpp2
-rw-r--r--hw/darwin/darwin.c2
-rw-r--r--hw/darwin/darwin.h2
-rw-r--r--hw/darwin/darwinClut8.h2
-rw-r--r--hw/darwin/darwinEvents.c2
-rw-r--r--hw/darwin/darwinKeyboard.c2
-rw-r--r--hw/darwin/darwinKeyboard.h2
-rw-r--r--hw/darwin/iokit/xfIOKit.c2
-rw-r--r--hw/darwin/iokit/xfIOKit.h2
-rw-r--r--hw/darwin/iokit/xfIOKitCursor.c2
-rw-r--r--hw/darwin/iokit/xfIOKitStartup.c2
-rw-r--r--hw/darwin/quartz/Preferences.h2
-rw-r--r--hw/darwin/quartz/Preferences.m2
-rw-r--r--hw/darwin/quartz/XApplication.h2
-rw-r--r--hw/darwin/quartz/XApplication.m2
-rw-r--r--hw/darwin/quartz/XDarwinStartup.c2
-rw-r--r--hw/darwin/quartz/XDarwinStartup.man2
-rw-r--r--hw/darwin/quartz/XServer.h2
-rw-r--r--hw/darwin/quartz/XServer.m2
-rw-r--r--hw/darwin/quartz/applewm.c2
-rw-r--r--hw/darwin/quartz/applewmExt.h2
-rw-r--r--hw/darwin/quartz/cr/XView.h2
-rw-r--r--hw/darwin/quartz/cr/XView.m2
-rw-r--r--hw/darwin/quartz/cr/cr.h2
-rw-r--r--hw/darwin/quartz/cr/crAppleWM.m2
-rw-r--r--hw/darwin/quartz/cr/crFrame.m2
-rw-r--r--hw/darwin/quartz/cr/crScreen.m2
-rw-r--r--hw/darwin/quartz/fullscreen/fullscreen.c2
-rw-r--r--hw/darwin/quartz/fullscreen/quartzCursor.c2
-rw-r--r--hw/darwin/quartz/fullscreen/quartzCursor.h2
-rw-r--r--hw/darwin/quartz/keysym2ucs.c2
-rw-r--r--hw/darwin/quartz/keysym2ucs.h2
-rw-r--r--hw/darwin/quartz/pseudoramiX.c2
-rw-r--r--hw/darwin/quartz/pseudoramiX.h2
-rw-r--r--hw/darwin/quartz/quartz.c2
-rw-r--r--hw/darwin/quartz/quartz.h2
-rw-r--r--hw/darwin/quartz/quartzAudio.c2
-rw-r--r--hw/darwin/quartz/quartzAudio.h2
-rw-r--r--hw/darwin/quartz/quartzCocoa.m2
-rw-r--r--hw/darwin/quartz/quartzCommon.h2
-rw-r--r--hw/darwin/quartz/quartzCursor.c2
-rw-r--r--hw/darwin/quartz/quartzCursor.h2
-rw-r--r--hw/darwin/quartz/quartzKeyboard.c2
-rw-r--r--hw/darwin/quartz/quartzPasteboard.c2
-rw-r--r--hw/darwin/quartz/quartzPasteboard.h2
-rw-r--r--hw/darwin/quartz/quartzStartup.c2
-rw-r--r--hw/darwin/quartz/xpr/Xplugin.h2
-rw-r--r--hw/darwin/quartz/xpr/appledri.c2
-rw-r--r--hw/darwin/quartz/xpr/dri.c2
-rw-r--r--hw/darwin/quartz/xpr/dri.h2
-rw-r--r--hw/darwin/quartz/xpr/dristruct.h2
-rw-r--r--hw/darwin/quartz/xpr/x-hash.c2
-rw-r--r--hw/darwin/quartz/xpr/x-hash.h2
-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.c2
-rw-r--r--hw/darwin/quartz/xpr/x-list.h2
-rw-r--r--hw/darwin/quartz/xpr/xpr.h2
-rw-r--r--hw/darwin/quartz/xpr/xprAppleWM.c2
-rw-r--r--hw/darwin/quartz/xpr/xprCursor.c2
-rw-r--r--hw/darwin/quartz/xpr/xprFrame.c2
-rw-r--r--hw/darwin/quartz/xpr/xprScreen.c2
-rw-r--r--hw/darwin/utils/README.txt2
-rw-r--r--hw/darwin/utils/dumpkeymap.c2
-rw-r--r--hw/darwin/utils/dumpkeymap.man2
-rw-r--r--hw/vfb/InitInput.c2
-rw-r--r--hw/vfb/InitOutput.c2
-rw-r--r--hw/vfb/Xvfb.man.pre2
-rw-r--r--hw/xfree86/common/extramodes2
-rw-r--r--hw/xfree86/common/modeline2c.pl2
-rw-r--r--hw/xfree86/common/vesamodes2
-rw-r--r--hw/xfree86/common/xf86Config.c2
-rw-r--r--hw/xfree86/common/xf86Configure.c2
-rw-r--r--hw/xfree86/common/xf86DGA.c2
-rw-r--r--hw/xfree86/common/xf86DefModes.c2
-rw-r--r--hw/xfree86/common/xf86Globals.c4
-rw-r--r--hw/xfree86/common/xf86KbdMach.c2
-rw-r--r--hw/xfree86/common/xf86RandR.c2
-rw-r--r--hw/xfree86/common/xf86sbusBus.c2
-rw-r--r--hw/xfree86/common/xf86sbusBus.h2
-rw-r--r--hw/xfree86/common/xf86xv.c2
-rw-r--r--hw/xfree86/common/xisb.c2
-rw-r--r--hw/xfree86/common/xisb.h2
-rw-r--r--hw/xfree86/ddc/DDC.HOWTO2
-rw-r--r--hw/xfree86/ddc/ddcProperty.c2
-rw-r--r--hw/xfree86/ddc/edid.c2
-rw-r--r--hw/xfree86/ddc/edid.h2
-rw-r--r--hw/xfree86/ddc/interpret_edid.c2
-rw-r--r--hw/xfree86/ddc/interpret_vdif.c2
-rw-r--r--hw/xfree86/ddc/print_edid.c2
-rw-r--r--hw/xfree86/ddc/print_vdif.c2
-rw-r--r--hw/xfree86/ddc/vdif.h2
-rw-r--r--hw/xfree86/ddc/xf86DDC.c2
-rw-r--r--hw/xfree86/ddc/xf86DDC.h2
-rw-r--r--hw/xfree86/dixmods/GLcoremodule.c2
-rw-r--r--hw/xfree86/dixmods/dbemodule.c2
-rw-r--r--hw/xfree86/dixmods/extmod/dgaproc.h2
-rw-r--r--hw/xfree86/dixmods/extmod/modinit.c2
-rw-r--r--hw/xfree86/dixmods/extmod/modinit.h2
-rw-r--r--hw/xfree86/dixmods/extmod/vidmodeproc.h2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dga.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dga2.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dgaext.h2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86miscproc.h2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86vmode.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xvmod.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xvmodproc.h2
-rw-r--r--hw/xfree86/dixmods/glxmodule.c2
-rw-r--r--hw/xfree86/dixmods/laymodule.c2
-rw-r--r--hw/xfree86/dixmods/recordmod.c2
-rw-r--r--hw/xfree86/dixmods/shmodule.c2
-rw-r--r--hw/xfree86/dixmods/xf86XTrapModule.c2
-rw-r--r--hw/xfree86/doc/README.DRI2
-rw-r--r--hw/xfree86/doc/README.fonts2
-rw-r--r--hw/xfree86/doc/README.rapidaccess2
-rw-r--r--hw/xfree86/doc/changelogs/CHANGELOG2
-rw-r--r--hw/xfree86/doc/changelogs/CHANGELOG.ND2
-rw-r--r--hw/xfree86/doc/devel/Domain.note2
-rw-r--r--hw/xfree86/doc/devel/README.DRIcomp2
-rw-r--r--hw/xfree86/doc/devel/Registry2
-rw-r--r--hw/xfree86/doc/sgml/DESIGN.sgml2
-rw-r--r--hw/xfree86/dri/dri.c2
-rw-r--r--hw/xfree86/dri/dri.h2
-rw-r--r--hw/xfree86/dri/drimodule.c2
-rw-r--r--hw/xfree86/dri/dristruct.h2
-rw-r--r--hw/xfree86/dri/sarea.h4
-rw-r--r--hw/xfree86/dri/xf86dri.c2
-rw-r--r--hw/xfree86/dummylib/README2
-rw-r--r--hw/xfree86/dummylib/dummylib.h2
-rw-r--r--hw/xfree86/dummylib/fatalerror.c2
-rw-r--r--hw/xfree86/dummylib/getvalidbios.c2
-rw-r--r--hw/xfree86/dummylib/logvwrite.c2
-rw-r--r--hw/xfree86/dummylib/pcitestmulti.c2
-rw-r--r--hw/xfree86/dummylib/verrorf.c2
-rw-r--r--hw/xfree86/dummylib/xalloc.c2
-rw-r--r--hw/xfree86/dummylib/xf86addrestolist.c2
-rw-r--r--hw/xfree86/dummylib/xf86allocscripi.c2
-rw-r--r--hw/xfree86/dummylib/xf86drvmsg.c2
-rw-r--r--hw/xfree86/dummylib/xf86drvmsgverb.c2
-rw-r--r--hw/xfree86/dummylib/xf86errorf.c2
-rw-r--r--hw/xfree86/dummylib/xf86errorfverb.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/xf86msg.c2
-rw-r--r--hw/xfree86/dummylib/xf86msgverb.c2
-rw-r--r--hw/xfree86/dummylib/xf86opt.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/fbdevhw/fbdevhw.c2
-rw-r--r--hw/xfree86/fbdevhw/fbdevhw.h2
-rw-r--r--hw/xfree86/fbdevhw/fbdevhw.man.pre2
-rw-r--r--hw/xfree86/fbdevhw/fbdevhwstub.c2
-rw-r--r--hw/xfree86/fbdevhw/fbpriv.h2
-rw-r--r--hw/xfree86/getconfig/cfg.man.pre2
-rw-r--r--hw/xfree86/getconfig/cfg.sample2
-rw-r--r--hw/xfree86/getconfig/getconfig.man.pre2
-rw-r--r--hw/xfree86/i2c/xf86i2c.c2
-rw-r--r--hw/xfree86/i2c/xf86i2c.h2
-rw-r--r--hw/xfree86/i2c/xf86i2cmodule.c2
-rw-r--r--hw/xfree86/int10/INT10.HOWTO2
-rw-r--r--hw/xfree86/int10/generic.c2
-rw-r--r--hw/xfree86/int10/helper_exec.c2
-rw-r--r--hw/xfree86/int10/helper_mem.c2
-rw-r--r--hw/xfree86/int10/pci.c2
-rw-r--r--hw/xfree86/int10/stub.c2
-rw-r--r--hw/xfree86/int10/xf86int10.c2
-rw-r--r--hw/xfree86/int10/xf86int10.h2
-rw-r--r--hw/xfree86/int10/xf86int10module.c2
-rw-r--r--hw/xfree86/int10/xf86x86emu.c2
-rw-r--r--hw/xfree86/int10/xf86x86emu.h2
-rw-r--r--hw/xfree86/loader/SparcMulDiv.S2
-rw-r--r--hw/xfree86/loader/aout.h2
-rw-r--r--hw/xfree86/loader/aoutloader.c2
-rw-r--r--hw/xfree86/loader/aoutloader.h2
-rw-r--r--hw/xfree86/loader/ar.h2
-rw-r--r--hw/xfree86/loader/coff.h2
-rw-r--r--hw/xfree86/loader/coffloader.c2
-rw-r--r--hw/xfree86/loader/coffloader.h2
-rw-r--r--hw/xfree86/loader/dlloader.h2
-rw-r--r--hw/xfree86/loader/elf.h2
-rw-r--r--hw/xfree86/loader/elfloader.c2
-rw-r--r--hw/xfree86/loader/elfloader.h2
-rw-r--r--hw/xfree86/loader/hash.c2
-rw-r--r--hw/xfree86/loader/hash.h2
-rw-r--r--hw/xfree86/loader/sym.h2
-rw-r--r--hw/xfree86/os-support/README.OS-lib2
-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/bsdResource.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_KbdMap.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_VTsw.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_apm.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_axp.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_ev56.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_init.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_io.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_jstk.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_kbd.c2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_kbd.h2
-rw-r--r--hw/xfree86/os-support/bsd/bsd_kmod.c2
-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.32
-rw-r--r--hw/xfree86/os-support/bsd/libusb/usb.h2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/usb_hid_usages2
-rw-r--r--hw/xfree86/os-support/bsd/libusb/usbvar.h2
-rw-r--r--hw/xfree86/os-support/bsd/memrange.h2
-rw-r--r--hw/xfree86/os-support/bsd/ppc_video.c2
-rw-r--r--hw/xfree86/os-support/bsd/sparc64_video.c2
-rw-r--r--hw/xfree86/os-support/bus/Sbus.c2
-rw-r--r--hw/xfree86/os-support/bus/axpPci.c2
-rw-r--r--hw/xfree86/os-support/bus/freebsdPci.c2
-rw-r--r--hw/xfree86/os-support/bus/linuxPci.c2
-rw-r--r--hw/xfree86/os-support/bus/ppcPci.c2
-rw-r--r--hw/xfree86/os-support/bus/xf86Sbus.h2
-rw-r--r--hw/xfree86/os-support/drm/drmmodule.c2
-rw-r--r--hw/xfree86/os-support/linux/int10/linux.c2
-rw-r--r--hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx.h2
-rw-r--r--hw/xfree86/os-support/linux/lnxResource.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_KbdMap.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_agp.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_apm.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_axp.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_ev56.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_init.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_io.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_jstk.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_kbd.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_kbd.h2
-rw-r--r--hw/xfree86/os-support/linux/lnx_kmod.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_pci.c2
-rw-r--r--hw/xfree86/os-support/linux/lnx_video.c2
-rw-r--r--hw/xfree86/os-support/lynxos/lynx_init.c2
-rw-r--r--hw/xfree86/os-support/lynxos/lynx_io.c2
-rw-r--r--hw/xfree86/os-support/lynxos/lynx_mmap.c2
-rw-r--r--hw/xfree86/os-support/lynxos/lynx_noinline.c2
-rw-r--r--hw/xfree86/os-support/lynxos/lynx_ppc.c2
-rw-r--r--hw/xfree86/os-support/lynxos/lynx_video.c2
-rw-r--r--hw/xfree86/os-support/misc/BUSmemcpy.S2
-rw-r--r--hw/xfree86/os-support/misc/BUSmemcpy.c2
-rw-r--r--hw/xfree86/os-support/misc/Delay.c2
-rw-r--r--hw/xfree86/os-support/misc/IODelay.S2
-rw-r--r--hw/xfree86/os-support/misc/IODelay.c2
-rw-r--r--hw/xfree86/os-support/misc/PortIO.S2
-rw-r--r--hw/xfree86/os-support/misc/SlowBcopy.S2
-rw-r--r--hw/xfree86/os-support/misc/SlowBcopy.c2
-rw-r--r--hw/xfree86/os-support/misc/xf86_IlHack.c2
-rw-r--r--hw/xfree86/os-support/misc/xf86_Util.c2
-rw-r--r--hw/xfree86/os-support/sco/VTsw_sco.c2
-rw-r--r--hw/xfree86/os-support/sco/sco_init.c2
-rw-r--r--hw/xfree86/os-support/sco/sco_io.c2
-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.c2
-rw-r--r--hw/xfree86/os-support/shared/VTsw_noop.c2
-rw-r--r--hw/xfree86/os-support/shared/VTsw_usl.c2
-rw-r--r--hw/xfree86/os-support/shared/bios_devmem.c2
-rw-r--r--hw/xfree86/os-support/shared/bios_mmap.c2
-rw-r--r--hw/xfree86/os-support/shared/inout.S2
-rw-r--r--hw/xfree86/os-support/shared/ioperm_noop.c2
-rw-r--r--hw/xfree86/os-support/shared/std_kbdEv.c2
-rw-r--r--hw/xfree86/os-support/shared/sysv_kbd.c2
-rw-r--r--hw/xfree86/os-support/shared/xf86Axp.h2
-rw-r--r--hw/xfree86/os-support/solaris/apSolaris.shar2
-rw-r--r--hw/xfree86/os-support/solaris/sun_bios.c2
-rw-r--r--hw/xfree86/os-support/solaris/sun_init.c2
-rw-r--r--hw/xfree86/os-support/solaris/sun_inout.s2
-rw-r--r--hw/xfree86/os-support/solaris/sun_io.c2
-rw-r--r--hw/xfree86/os-support/solaris/sun_kbd.c2
-rw-r--r--hw/xfree86/os-support/solaris/sun_kbdEv.c2
-rw-r--r--hw/xfree86/os-support/solaris/sun_vid.c2
-rw-r--r--hw/xfree86/os-support/sysv/sysv_init.c2
-rw-r--r--hw/xfree86/os-support/sysv/sysv_io.c2
-rw-r--r--hw/xfree86/os-support/sysv/sysv_video.c2
-rw-r--r--hw/xfree86/os-support/sysv/xqueue.c2
-rw-r--r--hw/xfree86/os-support/sysv/xqueue.h2
-rw-r--r--hw/xfree86/os-support/xf86OSKbd.h2
-rw-r--r--hw/xfree86/os-support/xf86_OSlib.h2
-rw-r--r--hw/xfree86/os-support/xf86_OSproc.h2
-rw-r--r--hw/xfree86/parser/DRI.c2
-rw-r--r--hw/xfree86/parser/cpconfig.c2
-rw-r--r--hw/xfree86/rac/xf86RAC.c2
-rw-r--r--hw/xfree86/rac/xf86RAC.h2
-rw-r--r--hw/xfree86/rac/xf86RACmodule.c2
-rw-r--r--hw/xfree86/ramdac/BT.c2
-rw-r--r--hw/xfree86/ramdac/BT.h2
-rw-r--r--hw/xfree86/ramdac/BTPriv.h2
-rw-r--r--hw/xfree86/ramdac/CURSOR.NOTES2
-rw-r--r--hw/xfree86/ramdac/IBM.c2
-rw-r--r--hw/xfree86/ramdac/IBM.h2
-rw-r--r--hw/xfree86/ramdac/IBMPriv.h2
-rw-r--r--hw/xfree86/ramdac/TI.c2
-rw-r--r--hw/xfree86/ramdac/TI.h2
-rw-r--r--hw/xfree86/ramdac/TIPriv.h2
-rw-r--r--hw/xfree86/ramdac/xf86Cursor.c2
-rw-r--r--hw/xfree86/ramdac/xf86Cursor.h2
-rw-r--r--hw/xfree86/ramdac/xf86CursorPriv.h2
-rw-r--r--hw/xfree86/ramdac/xf86HWCurs.c2
-rw-r--r--hw/xfree86/ramdac/xf86RamDac.c2
-rw-r--r--hw/xfree86/ramdac/xf86RamDac.h2
-rw-r--r--hw/xfree86/ramdac/xf86RamDacCmap.c2
-rw-r--r--hw/xfree86/ramdac/xf86RamDacMod.c2
-rw-r--r--hw/xfree86/ramdac/xf86RamDacPriv.h2
-rw-r--r--hw/xfree86/scanpci/extrapci.ids2
-rw-r--r--hw/xfree86/scanpci/xf86ScanPci.c2
-rw-r--r--hw/xfree86/shadowfb/sfbmodule.c2
-rw-r--r--hw/xfree86/shadowfb/shadow.c2
-rw-r--r--hw/xfree86/shadowfb/shadowfb.h2
-rw-r--r--hw/xfree86/utils/gtf/gtf.c2
-rw-r--r--hw/xfree86/utils/gtf/gtf.man.pre2
-rw-r--r--hw/xfree86/utils/ioport/ioport.c2
-rw-r--r--hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c2
-rw-r--r--hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre2
-rw-r--r--hw/xfree86/utils/kbd_mode/sun-kbd_mode.c2
-rw-r--r--hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre2
-rw-r--r--hw/xfree86/utils/pcitweak/pcitweak.man.pre2
-rw-r--r--hw/xfree86/utils/scanpci/scanpci.c2
-rw-r--r--hw/xfree86/utils/scanpci/scanpci.man.pre2
-rw-r--r--hw/xfree86/utils/xorgcfg/TODO2
-rw-r--r--hw/xfree86/utils/xorgcfg/accessx.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/card-cfg.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/card-cfg.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/card.xbm2
-rw-r--r--hw/xfree86/utils/xorgcfg/card.xpm2
-rw-r--r--hw/xfree86/utils/xorgcfg/cards.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/cards.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/computer.xpm2
-rw-r--r--hw/xfree86/utils/xorgcfg/config.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/config.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/expert.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/help.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/help.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/interface.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/keyboard-cfg.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/keyboard-cfg.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/keyboard.xbm2
-rw-r--r--hw/xfree86/utils/xorgcfg/keyboard.xpm2
-rw-r--r--hw/xfree86/utils/xorgcfg/loader.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/loader.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/loadmod.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/monitor-cfg.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/monitor-cfg.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/monitor.xbm2
-rw-r--r--hw/xfree86/utils/xorgcfg/monitor.xpm2
-rw-r--r--hw/xfree86/utils/xorgcfg/mouse-cfg.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/mouse-cfg.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/mouse.xbm2
-rw-r--r--hw/xfree86/utils/xorgcfg/mouse.xpm2
-rw-r--r--hw/xfree86/utils/xorgcfg/options.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/options.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/screen-cfg.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/screen-cfg.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/screen.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/screen.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/startx.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/stubs.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/stubs.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/text-mode.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/vidmode.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/vidmode.h2
-rw-r--r--hw/xfree86/utils/xorgcfg/xf86config.c2
-rw-r--r--hw/xfree86/utils/xorgcfg/xf86config.h2
-rw-r--r--hw/xfree86/utils/xorgconfig/Cards2
-rw-r--r--hw/xfree86/utils/xorgconfig/Cards982
-rw-r--r--hw/xfree86/utils/xorgconfig/cards.c2
-rw-r--r--hw/xfree86/utils/xorgconfig/cards.h2
-rw-r--r--hw/xfree86/vbe/vbe.c2
-rw-r--r--hw/xfree86/vbe/vbe.h2
-rw-r--r--hw/xfree86/vbe/vbeModes.c2
-rw-r--r--hw/xfree86/vbe/vbeModes.h2
-rw-r--r--hw/xfree86/vbe/vbe_module.c2
-rw-r--r--hw/xfree86/vgahw/vgaCmap.c2
-rw-r--r--hw/xfree86/x86emu/debug.c2
-rw-r--r--hw/xfree86/x86emu/decode.c2
-rw-r--r--hw/xfree86/x86emu/fpu.c2
-rw-r--r--hw/xfree86/x86emu/ops.c2
-rw-r--r--hw/xfree86/x86emu/ops2.c2
-rw-r--r--hw/xfree86/x86emu/sys.c2
-rw-r--r--hw/xfree86/x86emu/x86emu.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/debug.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/decode.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/fpu_regs.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/prim_asm.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/regs.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/types.h2
-rw-r--r--hw/xfree86/x86emu/x86emu/x86emui.h2
-rw-r--r--hw/xfree86/xaa/XAA.HOWTO2
-rw-r--r--hw/xfree86/xaa/xaa.h2
-rw-r--r--hw/xfree86/xaa/xaaBitBlt.c2
-rw-r--r--hw/xfree86/xaa/xaaBitOrder.c2
-rw-r--r--hw/xfree86/xaa/xaaBitmap.c2
-rw-r--r--hw/xfree86/xaa/xaaCpyArea.c2
-rw-r--r--hw/xfree86/xaa/xaaCpyPlane.c2
-rw-r--r--hw/xfree86/xaa/xaaCpyWin.c2
-rw-r--r--hw/xfree86/xaa/xaaDashLine.c2
-rw-r--r--hw/xfree86/xaa/xaaFallback.c2
-rw-r--r--hw/xfree86/xaa/xaaFillArc.c2
-rw-r--r--hw/xfree86/xaa/xaaFillPoly.c2
-rw-r--r--hw/xfree86/xaa/xaaFillRect.c2
-rw-r--r--hw/xfree86/xaa/xaaGC.c2
-rw-r--r--hw/xfree86/xaa/xaaGCmisc.c2
-rw-r--r--hw/xfree86/xaa/xaaImage.c2
-rw-r--r--hw/xfree86/xaa/xaaInit.c2
-rw-r--r--hw/xfree86/xaa/xaaInitAccel.c2
-rw-r--r--hw/xfree86/xaa/xaaLine.c2
-rw-r--r--hw/xfree86/xaa/xaaLineMisc.c2
-rw-r--r--hw/xfree86/xaa/xaaNonTEGlyph.c2
-rw-r--r--hw/xfree86/xaa/xaaNonTEText.c2
-rw-r--r--hw/xfree86/xaa/xaaOffscreen.c2
-rw-r--r--hw/xfree86/xaa/xaaOverlay.c2
-rw-r--r--hw/xfree86/xaa/xaaOverlayDF.c2
-rw-r--r--hw/xfree86/xaa/xaaPCache.c2
-rw-r--r--hw/xfree86/xaa/xaaPaintWin.c2
-rw-r--r--hw/xfree86/xaa/xaaPict.c2
-rw-r--r--hw/xfree86/xaa/xaaROP.c2
-rw-r--r--hw/xfree86/xaa/xaaRect.c2
-rw-r--r--hw/xfree86/xaa/xaaSpans.c2
-rw-r--r--hw/xfree86/xaa/xaaStateChange.c2
-rw-r--r--hw/xfree86/xaa/xaaStipple.c2
-rw-r--r--hw/xfree86/xaa/xaaTEGlyph.c2
-rw-r--r--hw/xfree86/xaa/xaaTEGlyphBlt.S2
-rw-r--r--hw/xfree86/xaa/xaaTEText.c2
-rw-r--r--hw/xfree86/xaa/xaaTables.c2
-rw-r--r--hw/xfree86/xaa/xaaWideLine.c2
-rw-r--r--hw/xfree86/xaa/xaacexp.h2
-rw-r--r--hw/xfree86/xaa/xaalocal.h2
-rw-r--r--hw/xfree86/xaa/xaarop.h2
-rw-r--r--hw/xfree86/xaa/xaawrap.h2
-rw-r--r--hw/xfree86/xf1bpp/mfbmap.h2
-rw-r--r--hw/xfree86/xf1bpp/mfbmap.sh2
-rw-r--r--hw/xfree86/xf1bpp/mfbunmap.h2
-rw-r--r--hw/xfree86/xf1bpp/mfbunmap.sh2
-rw-r--r--hw/xfree86/xf4bpp/NOTES2
-rw-r--r--hw/xfree86/xf4bpp/OScompiler.h2
-rw-r--r--hw/xfree86/xf4bpp/emulOpStip.c2
-rw-r--r--hw/xfree86/xf4bpp/emulRepAre.c2
-rw-r--r--hw/xfree86/xf4bpp/emulTile.c2
-rw-r--r--hw/xfree86/xf4bpp/ibmTrace.h2
-rw-r--r--hw/xfree86/xf4bpp/mfbbres.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbbresd.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbfillarc.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbhrzvert.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbimggblt.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbline.c2
-rw-r--r--hw/xfree86/xf4bpp/mfbzerarc.c2
-rw-r--r--hw/xfree86/xf4bpp/offscreen.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcArea.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcBStore.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcCReduce.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcClip.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcCpArea.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcDepth.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcFillRct.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcGC.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcGCstr.h2
-rw-r--r--hw/xfree86/xf4bpp/ppcGetSp.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcIO.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcImg.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcPixFS.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcPixmap.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcPntWin.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcPolyPnt.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcPolyRec.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcQuery.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcRslvC.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcSetSp.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcSpMcro.h2
-rw-r--r--hw/xfree86/xf4bpp/ppcWinFS.c2
-rw-r--r--hw/xfree86/xf4bpp/ppcWindow.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaBitBlt.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaGC.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaImages.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaReg.h2
-rw-r--r--hw/xfree86/xf4bpp/vgaSolid.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaStipple.c2
-rw-r--r--hw/xfree86/xf4bpp/vgaVideo.h2
-rw-r--r--hw/xfree86/xf4bpp/wm3.c2
-rw-r--r--hw/xfree86/xf4bpp/wm3.h2
-rw-r--r--hw/xfree86/xf4bpp/xf4bpp.h2
-rw-r--r--hw/xfree86/xf8_16bpp/cfb8_16.h2
-rw-r--r--hw/xfree86/xf8_16bpp/cfb8_16module.c2
-rw-r--r--hw/xfree86/xf8_16bpp/cfbscrinit.c2
-rw-r--r--hw/xfree86/xf8_16bpp/cfbwindow.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfb8_32.h2
-rw-r--r--hw/xfree86/xf8_32bpp/cfb8_32module.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbbstore.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbcpyarea.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbcpyplane.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbgc.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbgcmisc.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbgcunder.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbimage.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbpntwin.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbscrinit.c2
-rw-r--r--hw/xfree86/xf8_32bpp/cfbwindow.c2
-rw-r--r--hw/xfree86/xf8_32bpp/xf86overlay.c2
-rw-r--r--hw/xfree86/xf8_32wid/cfb8_32wid.h2
-rw-r--r--hw/xfree86/xf8_32wid/cfb8_32widmodule.c2
-rw-r--r--hw/xfree86/xf8_32wid/cfbscrinit.c2
-rw-r--r--hw/xfree86/xf8_32wid/cfbwid.c2
-rw-r--r--hw/xfree86/xf8_32wid/cfbwindow.c2
-rw-r--r--hw/xnest/Args.c2
-rw-r--r--hw/xnest/Args.h2
-rw-r--r--hw/xnest/Color.c2
-rw-r--r--hw/xnest/Color.h2
-rw-r--r--hw/xnest/Cursor.c2
-rw-r--r--hw/xnest/Display.c2
-rw-r--r--hw/xnest/Display.h2
-rw-r--r--hw/xnest/Drawable.h2
-rw-r--r--hw/xnest/Events.c2
-rw-r--r--hw/xnest/Events.h2
-rw-r--r--hw/xnest/Font.c2
-rw-r--r--hw/xnest/GC.c2
-rw-r--r--hw/xnest/GCOps.c2
-rw-r--r--hw/xnest/GCOps.h2
-rw-r--r--hw/xnest/GetTime.c2
-rw-r--r--hw/xnest/Handlers.c2
-rw-r--r--hw/xnest/Handlers.h2
-rw-r--r--hw/xnest/Init.c2
-rw-r--r--hw/xnest/Keyboard.c2
-rw-r--r--hw/xnest/Keyboard.h2
-rw-r--r--hw/xnest/Pixmap.c2
-rw-r--r--hw/xnest/Pointer.c2
-rw-r--r--hw/xnest/Pointer.h2
-rw-r--r--hw/xnest/Screen.c2
-rw-r--r--hw/xnest/Screen.h2
-rw-r--r--hw/xnest/TestExt.c2
-rw-r--r--hw/xnest/Visual.c2
-rw-r--r--hw/xnest/Visual.h2
-rw-r--r--hw/xnest/Window.c2
-rw-r--r--hw/xnest/XNCursor.h2
-rw-r--r--hw/xnest/XNFont.h2
-rw-r--r--hw/xnest/XNGC.h2
-rw-r--r--hw/xnest/XNPixmap.h2
-rw-r--r--hw/xnest/XNWindow.h2
-rw-r--r--hw/xnest/Xnest.h2
-rw-r--r--hw/xnest/Xnest.man.pre2
-rw-r--r--hw/xnest/os2Stub.c2
-rw-r--r--hw/xwin/InitInput.c2
-rw-r--r--hw/xwin/InitOutput.c2
-rw-r--r--hw/xwin/XWin.man2
-rw-r--r--hw/xwin/XWin.rc2
-rw-r--r--hw/xwin/ddraw.h2
-rw-r--r--hw/xwin/win.h2
-rw-r--r--hw/xwin/winallpriv.c2
-rw-r--r--hw/xwin/winblock.c2
-rw-r--r--hw/xwin/winclip.c2
-rw-r--r--hw/xwin/winclipboard.h2
-rw-r--r--hw/xwin/winclipboardinit.c2
-rw-r--r--hw/xwin/winclipboardtextconv.c2
-rw-r--r--hw/xwin/winclipboardthread.c2
-rw-r--r--hw/xwin/winclipboardunicode.c2
-rw-r--r--hw/xwin/winclipboardwndproc.c2
-rw-r--r--hw/xwin/winclipboardxevents.c2
-rw-r--r--hw/xwin/wincmap.c2
-rw-r--r--hw/xwin/winconfig.c2
-rw-r--r--hw/xwin/winconfig.h2
-rw-r--r--hw/xwin/wincreatewnd.c2
-rw-r--r--hw/xwin/wincursor.c2
-rwxr-xr-xhw/xwin/windialogs.c2
-rw-r--r--hw/xwin/winengine.c2
-rw-r--r--hw/xwin/winerror.c2
-rw-r--r--hw/xwin/winfillsp.c2
-rw-r--r--hw/xwin/winfont.c2
-rw-r--r--hw/xwin/wingc.c2
-rw-r--r--hw/xwin/wingetsp.c2
-rw-r--r--hw/xwin/winkeybd.c2
-rw-r--r--hw/xwin/winkeybd.h2
-rw-r--r--hw/xwin/winmisc.c2
-rw-r--r--hw/xwin/winmouse.c2
-rw-r--r--hw/xwin/winms.h2
-rw-r--r--hw/xwin/winmsg.c2
-rw-r--r--hw/xwin/winmsg.h2
-rwxr-xr-xhw/xwin/winmultiwindowclass.c2
-rwxr-xr-xhw/xwin/winmultiwindowclass.h2
-rwxr-xr-xhw/xwin/winmultiwindowicons.c2
-rwxr-xr-xhw/xwin/winmultiwindowshape.c2
-rw-r--r--hw/xwin/winmultiwindowwindow.c2
-rw-r--r--hw/xwin/winmultiwindowwm.c2
-rwxr-xr-xhw/xwin/winmultiwindowwndproc.c2
-rw-r--r--hw/xwin/winnativegdi.c2
-rw-r--r--hw/xwin/winpfbdd.c2
-rw-r--r--hw/xwin/winpixmap.c2
-rw-r--r--hw/xwin/winpntwin.c2
-rw-r--r--hw/xwin/winpolyline.c2
-rw-r--r--hw/xwin/winprefs.c2
-rw-r--r--hw/xwin/winprefs.h2
-rw-r--r--hw/xwin/winprefslex.l2
-rw-r--r--hw/xwin/winprefsyacc.y2
-rw-r--r--hw/xwin/winpushpxl.c2
-rw-r--r--hw/xwin/winregistry.c2
-rw-r--r--hw/xwin/winrop.c2
-rw-r--r--hw/xwin/winscrinit.c2
-rw-r--r--hw/xwin/winsetsp.c2
-rw-r--r--hw/xwin/winshaddd.c2
-rw-r--r--hw/xwin/winshadddnl.c2
-rw-r--r--hw/xwin/winshadgdi.c2
-rwxr-xr-xhw/xwin/wintrayicon.c2
-rwxr-xr-xhw/xwin/winvideo.c2
-rw-r--r--hw/xwin/winwakeup.c2
-rw-r--r--hw/xwin/winwindow.c2
-rw-r--r--hw/xwin/winwindow.h2
-rw-r--r--hw/xwin/winwndproc.c2
-rw-r--r--ilbm/ilbm.h2
-rw-r--r--ilbm/ilbmbitblt.c2
-rw-r--r--ilbm/ilbmblt.c2
-rw-r--r--ilbm/ilbmbres.c2
-rw-r--r--ilbm/ilbmbresd.c2
-rw-r--r--ilbm/ilbmbstore.c2
-rw-r--r--ilbm/ilbmclip.c2
-rw-r--r--ilbm/ilbmcmap.c2
-rw-r--r--ilbm/ilbmfillarc.c2
-rw-r--r--ilbm/ilbmfillrct.c2
-rw-r--r--ilbm/ilbmfillsp.c2
-rw-r--r--ilbm/ilbmfont.c2
-rw-r--r--ilbm/ilbmgc.c2
-rw-r--r--ilbm/ilbmgetsp.c2
-rw-r--r--ilbm/ilbmhrzvert.c2
-rw-r--r--ilbm/ilbmimage.c2
-rw-r--r--ilbm/ilbmimggblt.c2
-rw-r--r--ilbm/ilbmline.c2
-rw-r--r--ilbm/ilbmmisc.c2
-rw-r--r--ilbm/ilbmpixmap.c2
-rw-r--r--ilbm/ilbmply1rct.c2
-rw-r--r--ilbm/ilbmplygblt.c2
-rw-r--r--ilbm/ilbmpntarea.c2
-rw-r--r--ilbm/ilbmpntwin.c2
-rw-r--r--ilbm/ilbmpolypnt.c2
-rw-r--r--ilbm/ilbmpushpxl.c2
-rw-r--r--ilbm/ilbmscrinit.c2
-rw-r--r--ilbm/ilbmsetsp.c2
-rw-r--r--ilbm/ilbmtegblt.c2
-rw-r--r--ilbm/ilbmtile.c2
-rw-r--r--ilbm/ilbmwindow.c2
-rw-r--r--ilbm/ilbmzerarc.c2
-rw-r--r--include/XIstubs.h2
-rw-r--r--include/bstore.h2
-rw-r--r--include/bstorestr.h2
-rw-r--r--include/closestr.h2
-rw-r--r--include/colormap.h2
-rw-r--r--include/cursor.h2
-rw-r--r--include/cursorstr.h2
-rw-r--r--include/dix.h2
-rw-r--r--include/dixevents.h2
-rw-r--r--include/dixfont.h2
-rw-r--r--include/dixgrabs.h2
-rw-r--r--include/dixstruct.h2
-rw-r--r--include/exevents.h2
-rw-r--r--include/extension.h2
-rw-r--r--include/extinit.h2
-rw-r--r--include/extnsionst.h2
-rw-r--r--include/gc.h2
-rw-r--r--include/gcstruct.h2
-rw-r--r--include/globals.h2
-rw-r--r--include/input.h2
-rw-r--r--include/inputstr.h2
-rw-r--r--include/misc.h2
-rw-r--r--include/miscstruct.h2
-rw-r--r--include/opaque.h2
-rw-r--r--include/os.h2
-rw-r--r--include/pixmap.h2
-rw-r--r--include/pixmapstr.h2
-rw-r--r--include/property.h2
-rw-r--r--include/propertyst.h2
-rw-r--r--include/regionstr.h2
-rw-r--r--include/resource.h2
-rw-r--r--include/screenint.h2
-rw-r--r--include/scrnintstr.h2
-rw-r--r--include/servermd.h2
-rw-r--r--include/site.h2
-rw-r--r--include/swaprep.h2
-rw-r--r--include/swapreq.h2
-rw-r--r--include/validate.h2
-rw-r--r--include/window.h2
-rw-r--r--include/windowstr.h2
-rw-r--r--iplan2p4/ipl.h2
-rw-r--r--iplan2p4/iplallpriv.c2
-rw-r--r--iplan2p4/iplbitblt.c2
-rw-r--r--iplan2p4/iplblt.c2
-rw-r--r--iplan2p4/iplbres.c2
-rw-r--r--iplan2p4/iplbresd.c2
-rw-r--r--iplan2p4/iplbstore.c2
-rw-r--r--iplan2p4/iplcmap.c2
-rw-r--r--iplan2p4/iplfillarc.c2
-rw-r--r--iplan2p4/iplfillrct.c2
-rw-r--r--iplan2p4/iplfillsp.c2
-rw-r--r--iplan2p4/iplgc.c2
-rw-r--r--iplan2p4/iplgetsp.c2
-rw-r--r--iplan2p4/iplhrzvert.c2
-rw-r--r--iplan2p4/iplimage.c2
-rw-r--r--iplan2p4/iplline.c2
-rw-r--r--iplan2p4/iplmap.h2
-rw-r--r--iplan2p4/iplmergerop.h2
-rw-r--r--iplan2p4/iplmskbits.c2
-rw-r--r--iplan2p4/iplmskbits.h2
-rw-r--r--iplan2p4/iplpack.c2
-rw-r--r--iplan2p4/iplpack.h2
-rw-r--r--iplan2p4/iplpixmap.c2
-rw-r--r--iplan2p4/iplply1rct.c2
-rw-r--r--iplan2p4/iplpntwin.c2
-rw-r--r--iplan2p4/iplpolypnt.c2
-rw-r--r--iplan2p4/iplrrop.c2
-rw-r--r--iplan2p4/iplrrop.h2
-rw-r--r--iplan2p4/iplscrinit.c2
-rw-r--r--iplan2p4/iplsetsp.c2
-rw-r--r--iplan2p4/iplsolid.c2
-rw-r--r--iplan2p4/ipltegblt.c2
-rw-r--r--iplan2p4/ipltile32.c2
-rw-r--r--iplan2p4/ipltileodd.c2
-rw-r--r--iplan2p4/iplwindow.c2
-rw-r--r--lbx/lbxcmap.c2
-rw-r--r--lbx/lbxdix.c2
-rw-r--r--lbx/lbxexts.c2
-rw-r--r--lbx/lbxgfx.c2
-rw-r--r--lbx/lbxmain.c2
-rw-r--r--lbx/lbxopts.c2
-rw-r--r--lbx/lbxprop.c2
-rw-r--r--lbx/lbxserve.h2
-rw-r--r--lbx/lbxsquish.c2
-rw-r--r--lbx/lbxsrvopts.h2
-rw-r--r--lbx/lbxswap.c2
-rw-r--r--lbx/lbxtables.c2
-rw-r--r--lbx/lbxtags.c2
-rw-r--r--lbx/lbxtags.h2
-rw-r--r--lbx/lbxzerorep.c2
-rw-r--r--mfb/fastblt.h2
-rw-r--r--mfb/maskbits.c2
-rw-r--r--mfb/maskbits.h2
-rw-r--r--mfb/mergerop.h2
-rw-r--r--mfb/mfb.h2
-rw-r--r--mfb/mfbbitblt.c2
-rw-r--r--mfb/mfbblt.c2
-rw-r--r--mfb/mfbbres.c2
-rw-r--r--mfb/mfbbresd.c2
-rw-r--r--mfb/mfbclip.c2
-rw-r--r--mfb/mfbcmap.c2
-rw-r--r--mfb/mfbfillarc.c2
-rw-r--r--mfb/mfbfillrct.c2
-rw-r--r--mfb/mfbfillsp.c2
-rw-r--r--mfb/mfbgc.c2
-rw-r--r--mfb/mfbgetsp.c2
-rw-r--r--mfb/mfbhrzvert.c2
-rw-r--r--mfb/mfbimage.c2
-rw-r--r--mfb/mfbimggblt.c2
-rw-r--r--mfb/mfbline.c2
-rw-r--r--mfb/mfbply1rct.c2
-rw-r--r--mfb/mfbplygblt.c2
-rw-r--r--mfb/mfbpolypnt.c2
-rw-r--r--mfb/mfbpushpxl.c2
-rw-r--r--mfb/mfbscrclse.c2
-rw-r--r--mfb/mfbscrinit.c2
-rw-r--r--mfb/mfbsetsp.c2
-rw-r--r--mfb/mfbtegblt.c2
-rw-r--r--mfb/mfbtile.c2
-rw-r--r--mfb/mfbwindow.c2
-rw-r--r--mfb/mfbzerarc.c2
-rw-r--r--mi/cbrt.c2
-rw-r--r--mi/mi.h2
-rw-r--r--mi/miarc.c2
-rw-r--r--mi/mibank.c2
-rw-r--r--mi/mibank.h2
-rw-r--r--mi/mibitblt.c2
-rw-r--r--mi/mibstore.c2
-rw-r--r--mi/mibstore.h2
-rw-r--r--mi/mibstorest.h2
-rw-r--r--mi/miclipn.c2
-rw-r--r--mi/micmap.c2
-rw-r--r--mi/micmap.h2
-rw-r--r--mi/micursor.c2
-rw-r--r--mi/midash.c2
-rw-r--r--mi/midispcur.c2
-rw-r--r--mi/mieq.c2
-rw-r--r--mi/miexpose.c2
-rw-r--r--mi/mifillarc.c2
-rw-r--r--mi/mifillarc.h2
-rw-r--r--mi/mifillrct.c2
-rw-r--r--mi/mifpoly.h2
-rw-r--r--mi/mifpolycon.c2
-rw-r--r--mi/migc.c2
-rw-r--r--mi/migc.h2
-rw-r--r--mi/miglblt.c2
-rw-r--r--mi/miinitext.c2
-rw-r--r--mi/miline.h2
-rw-r--r--mi/mioverlay.c2
-rw-r--r--mi/mioverlay.h2
-rw-r--r--mi/mipointer.c2
-rw-r--r--mi/mipointer.h2
-rw-r--r--mi/mipointrst.h2
-rw-r--r--mi/mipoly.c2
-rw-r--r--mi/mipoly.h2
-rw-r--r--mi/mipolycon.c2
-rw-r--r--mi/mipolygen.c2
-rw-r--r--mi/mipolypnt.c2
-rw-r--r--mi/mipolyrect.c2
-rw-r--r--mi/mipolyseg.c2
-rw-r--r--mi/mipolytext.c2
-rw-r--r--mi/mipolyutil.c2
-rw-r--r--mi/mipushpxl.c2
-rw-r--r--mi/miregion.c2
-rw-r--r--mi/miscrinit.c2
-rw-r--r--mi/mispans.c2
-rw-r--r--mi/mispans.h2
-rw-r--r--mi/misprite.c2
-rw-r--r--mi/misprite.h2
-rw-r--r--mi/mispritest.h2
-rw-r--r--mi/mistruct.h2
-rw-r--r--mi/mivalidate.h2
-rw-r--r--mi/mivaltree.c2
-rw-r--r--mi/miwideline.c2
-rw-r--r--mi/miwideline.h2
-rw-r--r--mi/miwindow.c2
-rw-r--r--mi/mizerarc.c2
-rw-r--r--mi/mizerarc.h2
-rw-r--r--mi/mizerclip.c2
-rw-r--r--mi/mizerline.c2
-rw-r--r--miext/layer/layer.h2
-rw-r--r--miext/layer/layergc.c2
-rw-r--r--miext/layer/layerinit.c2
-rw-r--r--miext/layer/layerpict.c2
-rw-r--r--miext/layer/layerstr.h2
-rw-r--r--miext/layer/layerwin.c2
-rw-r--r--miext/rootless/accel/rlAccel.h2
-rw-r--r--miext/rootless/accel/rlBlt.c2
-rw-r--r--miext/rootless/accel/rlCopy.c2
-rw-r--r--miext/rootless/accel/rlFill.c2
-rw-r--r--miext/rootless/accel/rlFillRect.c2
-rw-r--r--miext/rootless/accel/rlFillSpans.c2
-rw-r--r--miext/rootless/accel/rlGlyph.c2
-rw-r--r--miext/rootless/accel/rlSolid.c2
-rw-r--r--miext/rootless/rootless.h2
-rw-r--r--miext/rootless/rootlessCommon.c2
-rw-r--r--miext/rootless/rootlessCommon.h2
-rw-r--r--miext/rootless/rootlessConfig.h2
-rw-r--r--miext/rootless/rootlessGC.c2
-rw-r--r--miext/rootless/rootlessScreen.c2
-rw-r--r--miext/rootless/rootlessValTree.c2
-rw-r--r--miext/rootless/rootlessWindow.c2
-rw-r--r--miext/rootless/rootlessWindow.h2
-rw-r--r--miext/rootless/safeAlpha/safeAlpha.h2
-rw-r--r--miext/rootless/safeAlpha/safeAlphaPicture.c2
-rw-r--r--miext/rootless/safeAlpha/safeAlphaWindow.c2
-rw-r--r--miext/shadow/shadow.c2
-rw-r--r--miext/shadow/shadow.h2
-rw-r--r--miext/shadow/shalloc.c2
-rw-r--r--miext/shadow/shpacked.c2
-rw-r--r--miext/shadow/shplanar.c2
-rw-r--r--miext/shadow/shplanar8.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_90.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/shrotate.c2
-rw-r--r--miext/shadow/shrotpack.h2
-rw-r--r--os/WaitFor.c2
-rw-r--r--os/access.c2
-rw-r--r--os/auth.c2
-rw-r--r--os/connection.c2
-rw-r--r--os/io.c2
-rw-r--r--os/k5auth.c2
-rw-r--r--os/lbxio.c2
-rw-r--r--os/mitauth.c2
-rw-r--r--os/oscolor.c2
-rw-r--r--os/osdep.h2
-rw-r--r--os/osinit.c2
-rw-r--r--os/rpcauth.c2
-rw-r--r--os/secauth.c2
-rw-r--r--os/strlcat.c2
-rw-r--r--os/strlcpy.c2
-rw-r--r--os/utils.c2
-rw-r--r--os/xalloc.c2
-rw-r--r--os/xdmauth.c2
-rw-r--r--os/xdmcp.c2
-rw-r--r--randr/mirandr.c2
-rw-r--r--randr/randr.c2
-rw-r--r--randr/randrstr.h2
-rw-r--r--record/record.c2
-rw-r--r--record/set.c2
-rw-r--r--record/set.h2
-rw-r--r--render/animcur.c2
-rw-r--r--render/filter.c2
-rw-r--r--render/glyph.c2
-rw-r--r--render/glyphstr.h2
-rw-r--r--render/miglyph.c2
-rw-r--r--render/miindex.c2
-rw-r--r--render/mipict.c2
-rw-r--r--render/mipict.h2
-rw-r--r--render/mirect.c2
-rw-r--r--render/mitrap.c2
-rw-r--r--render/mitri.c2
-rw-r--r--render/picture.c2
-rw-r--r--render/picture.h2
-rw-r--r--render/picturestr.h2
-rw-r--r--render/render.c2
-rw-r--r--xkb/XKBAlloc.c2
-rw-r--r--xkb/XKBGAlloc.c2
-rw-r--r--xkb/XKBMAlloc.c2
-rw-r--r--xkb/XKBMisc.c2
-rw-r--r--xkb/ddxBeep.c2
-rw-r--r--xkb/ddxConfig.c2
-rw-r--r--xkb/ddxCtrls.c2
-rw-r--r--xkb/ddxDevBtn.c2
-rw-r--r--xkb/ddxFakeBtn.c2
-rw-r--r--xkb/ddxFakeMtn.c2
-rw-r--r--xkb/ddxInit.c2
-rw-r--r--xkb/ddxKeyClick.c2
-rw-r--r--xkb/ddxKillSrv.c2
-rw-r--r--xkb/ddxLEDs.c2
-rw-r--r--xkb/ddxList.c2
-rw-r--r--xkb/ddxLoad.c2
-rw-r--r--xkb/ddxPrivate.c2
-rw-r--r--xkb/ddxVT.c2
-rw-r--r--xkb/maprules.c2
-rw-r--r--xkb/xkb.c2
-rw-r--r--xkb/xkb.h2
-rw-r--r--xkb/xkbAccessX.c2
-rw-r--r--xkb/xkbActions.c2
-rw-r--r--xkb/xkbDflts.h2
-rw-r--r--xkb/xkbEvents.c2
-rw-r--r--xkb/xkbInit.c2
-rw-r--r--xkb/xkbLEDs.c2
-rw-r--r--xkb/xkbPrKeyEv.c2
-rw-r--r--xkb/xkbPrOtherEv.c2
-rw-r--r--xkb/xkbSwap.c2
-rw-r--r--xkb/xkbUtils.c2
-rw-r--r--xkb/xkbconfig.c2
-rw-r--r--xkb/xkberrs.c2
-rw-r--r--xkb/xkbfmisc.c2
-rw-r--r--xkb/xkbout.c2
-rw-r--r--xkb/xkbtext.c2
-rw-r--r--xkb/xkmread.c2
1324 files changed, 1326 insertions, 1326 deletions
diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c
index ae3276a02..dd039ce01 100644
--- a/GL/apple/aglGlx.c
+++ b/GL/apple/aglGlx.c
@@ -32,7 +32,7 @@
* 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: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include <AGL/agl.h>
diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c
index b1292b606..c57ae2bd6 100644
--- a/GL/apple/indirect.c
+++ b/GL/apple/indirect.c
@@ -34,7 +34,7 @@
* 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: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
+/* $XFree86$ */
#include "dri.h"
#include "quartz.h"
diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c
index 47988a595..52c61b0bb 100644
--- a/GL/glx/g_disptab.c
+++ b/GL/glx/g_disptab.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
+/* $XFree86$ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h
index e311d98c3..7f160b093 100644
--- a/GL/glx/g_disptab.h
+++ b/GL/glx/g_disptab.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86$ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
#ifndef _GLX_g_disptab_h_
#define _GLX_g_disptab_h_
diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c
index 472a2d443..5f6fe74ad 100644
--- a/GL/glx/g_disptab_EXT.c
+++ b/GL/glx/g_disptab_EXT.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
+/* $XFree86$ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h
index 3aca9347f..44dda2450 100644
--- a/GL/glx/g_disptab_EXT.h
+++ b/GL/glx/g_disptab_EXT.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86$ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
#ifndef _GLX_g_disptab_EXT_h_
#define _GLX_g_disptab_EXT_h_
diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c
index 88834bf39..4f55ca640 100644
--- a/GL/glx/g_render.c
+++ b/GL/glx/g_render.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $XFree86$ */
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
/*
** License Applicability. Except to the extent portions of this file are
diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c
index ac4cb0b73..760ee49fd 100644
--- a/GL/glx/g_renderswap.c
+++ b/GL/glx/g_renderswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $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/g_single.c b/GL/glx/g_single.c
index 5bcec133c..bc5f8f755 100644
--- a/GL/glx/g_single.c
+++ b/GL/glx/g_single.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */
+/* $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/g_singleswap.c b/GL/glx/g_singleswap.c
index 34515997e..b3171ad4e 100644
--- a/GL/glx/g_singleswap.c
+++ b/GL/glx/g_singleswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
+/* $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/global.c b/GL/glx/global.c
index 9cd011ec9..73c2e8f3f 100644
--- a/GL/glx/global.c
+++ b/GL/glx/global.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
+/* $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/glxbuf.c b/GL/glx/glxbuf.c
index 6e6f6142b..24384fa3e 100644
--- a/GL/glx/glxbuf.c
+++ b/GL/glx/glxbuf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */
+/* $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/glxbuf.h b/GL/glx/glxbuf.h
index a298b3471..611602f38 100644
--- a/GL/glx/glxbuf.h
+++ b/GL/glx/glxbuf.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxbuf_h_
#define _glxbuf_h_
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 57c064d19..4d927c0bb 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.13 2004/02/12 02:25:01 torrey Exp $ */
+/* $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/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index 0126b4699..9f9fca579 100644
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.11 2004/02/12 02:25:01 torrey Exp $ */
+/* $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/glxcontext.h b/GL/glx/glxcontext.h
index 6454b4952..f2ebb2593 100644
--- a/GL/glx/glxcontext.h
+++ b/GL/glx/glxcontext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86$ */
#ifndef _GLX_context_h_
#define _GLX_context_h_
diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h
index a2c806f44..7650adf90 100644
--- a/GL/glx/glxdrawable.h
+++ b/GL/glx/glxdrawable.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86$ */
#ifndef _GLX_drawable_h_
#define _GLX_drawable_h_
diff --git a/GL/glx/glxerror.h b/GL/glx/glxerror.h
index 3c1e93c61..5aad9c3e7 100644
--- a/GL/glx/glxerror.h
+++ b/GL/glx/glxerror.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _GLX_error_h_
#define _GLX_error_h_
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index ac08c3df9..7fe87dec9 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.10 2004/01/28 22:36:05 alanh Exp $
+/* $XFree86$
** The contents of this file are subject to the GLX Public License Version 1.0
** (the "License"). You may not use this file except in compliance with the
** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h
index fb0d21b85..605d09e78 100644
--- a/GL/glx/glxext.h
+++ b/GL/glx/glxext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.8 2004/02/09 23:46:31 alanh Exp $ */
+/* $XFree86$ */
#ifndef _glxext_h_
#define _glxext_h_
diff --git a/GL/glx/glxfb.c b/GL/glx/glxfb.c
index 4ce952d51..789eda52b 100644
--- a/GL/glx/glxfb.c
+++ b/GL/glx/glxfb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $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/glxfb.h b/GL/glx/glxfb.h
index 44a72a3e2..a0011a9ce 100644
--- a/GL/glx/glxfb.h
+++ b/GL/glx/glxfb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxfb_h_
#define _glxfb_h_
diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c
index 7ec1134cd..5a85ec6a6 100644
--- a/GL/glx/glximports.c
+++ b/GL/glx/glximports.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
+/* $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/glximports.h b/GL/glx/glximports.h
index e1a65a70e..18fd2c6f1 100644
--- a/GL/glx/glximports.h
+++ b/GL/glx/glximports.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86$ */
#ifndef _glximports_h_
#define _glximports_h_
diff --git a/GL/glx/glxmem.c b/GL/glx/glxmem.c
index 0c3ea25a7..dab6c16a5 100644
--- a/GL/glx/glxmem.c
+++ b/GL/glx/glxmem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */
+/* $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/glxmem.h b/GL/glx/glxmem.h
index 93a277559..889046721 100644
--- a/GL/glx/glxmem.h
+++ b/GL/glx/glxmem.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxmem_h_
#define _glxmem_h_
diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c
index b21d4ade9..7e90be2bc 100644
--- a/GL/glx/glxpix.c
+++ b/GL/glx/glxpix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
+/* $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/glxpix.h b/GL/glx/glxpix.h
index d7a9afab0..2147a6d03 100644
--- a/GL/glx/glxpix.h
+++ b/GL/glx/glxpix.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
#ifndef _glxpix_h_
#define _glxpix_h_
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 1a64b0e19..b95cb36bc 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.15 2004/02/12 02:25:01 torrey Exp $ */
+/* $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/glxscreens.h b/GL/glx/glxscreens.h
index 99f76dc38..f4183e2d3 100644
--- a/GL/glx/glxscreens.h
+++ b/GL/glx/glxscreens.h
@@ -1,7 +1,7 @@
#ifndef _GLX_screens_h_
#define _GLX_screens_h_
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.5 2002/02/22 21:45:07 dawes Exp $ */
+/* $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/glxserver.h b/GL/glx/glxserver.h
index 9446aefcc..d28272c99 100644
--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.6 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86$ */
#ifndef _GLX_server_h_
#define _GLX_server_h_
diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c
index ebc9a2bfc..a5c727bfe 100644
--- a/GL/glx/glxutil.c
+++ b/GL/glx/glxutil.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
+/* $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/glxutil.h b/GL/glx/glxutil.h
index 1f736f0f1..ab3a5c9e9 100644
--- a/GL/glx/glxutil.h
+++ b/GL/glx/glxutil.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+/* $XFree86$ */
#ifndef _glxcmds_h_
#define _glxcmds_h_
diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h
index 322ee18c8..78db89105 100644
--- a/GL/glx/impsize.h
+++ b/GL/glx/impsize.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86$ */
#ifndef _impsize_h_
#define _impsize_h_
diff --git a/GL/glx/render2.c b/GL/glx/render2.c
index 56453ceff..501f759bf 100644
--- a/GL/glx/render2.c
+++ b/GL/glx/render2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */
+/* $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/render2swap.c b/GL/glx/render2swap.c
index b272c6ba9..84a255183 100644
--- a/GL/glx/render2swap.c
+++ b/GL/glx/render2swap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.7 2004/02/03 23:04:08 alanh Exp $ */
+/* $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/renderpix.c b/GL/glx/renderpix.c
index ad5625dd6..5ffa47ddb 100644
--- a/GL/glx/renderpix.c
+++ b/GL/glx/renderpix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $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 3b0e1f6b7..81d4e375f 100644
--- a/GL/glx/renderpixswap.c
+++ b/GL/glx/renderpixswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $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/rensize.c b/GL/glx/rensize.c
index e73135db3..43175905e 100644
--- a/GL/glx/rensize.c
+++ b/GL/glx/rensize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.7 2004/01/28 18:11:53 alanh Exp $ */
+/* $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/rensizetab.c b/GL/glx/rensizetab.c
index 04ffff6bc..75eeaa718 100644
--- a/GL/glx/rensizetab.c
+++ b/GL/glx/rensizetab.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.6 2004/02/03 23:04:08 alanh Exp $ */
+/* $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/single2.c b/GL/glx/single2.c
index 3120ae171..582a43245 100644
--- a/GL/glx/single2.c
+++ b/GL/glx/single2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.9 2004/02/11 09:18:15 alanh Exp $ */
+/* $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/single2swap.c b/GL/glx/single2swap.c
index 5b76b91e0..396d43770 100644
--- a/GL/glx/single2swap.c
+++ b/GL/glx/single2swap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.8 2004/02/09 23:46:31 alanh Exp $ */
+/* $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 85be77d85..4459d81b1 100644
--- a/GL/glx/singlepix.c
+++ b/GL/glx/singlepix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $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/singlepixswap.c b/GL/glx/singlepixswap.c
index 2b488312e..57bef71c7 100644
--- a/GL/glx/singlepixswap.c
+++ b/GL/glx/singlepixswap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
+/* $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.c b/GL/glx/singlesize.c
index 3f3054871..8085631bf 100644
--- a/GL/glx/singlesize.c
+++ b/GL/glx/singlesize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.8 2004/02/09 19:51:32 tsi Exp $ */
+/* $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 829338094..15941ec4b 100644
--- a/GL/glx/singlesize.h
+++ b/GL/glx/singlesize.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
#ifndef _singlesize_h_
#define _singlesize_h_
diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h
index 62fc43761..dadd8073c 100644
--- a/GL/glx/unpack.h
+++ b/GL/glx/unpack.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.5 2002/10/30 12:52:03 alanh Exp $ */
+/* $XFree86$ */
#ifndef __GLX_unpack_h__
#define __GLX_unpack_h__
diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c
index 3ea767d2b..cb87d552d 100644
--- a/GL/glx/xfont.c
+++ b/GL/glx/xfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $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/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h
index c50288055..e6e0f055b 100644
--- a/GL/include/GL/glx_ansic.h
+++ b/GL/include/GL/glx_ansic.h
@@ -1,7 +1,7 @@
#ifndef _glx_ansic_h_
#define _glx_ansic_h_
-/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */
+/* $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/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h
index 7a467b9b5..298a62b3f 100644
--- a/GL/include/GL/xf86glx.h
+++ b/GL/include/GL/xf86glx.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c
index 170726bff..041013043 100644
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.2 2002/01/23 03:31:39 dawes Exp $ */
+/* $XFree86$ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index d09b2120a..fc0df0525 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */
+/* $XFree86$ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c
index 435ca71f6..cab6d5e11 100644
--- a/XTrap/xtrapdiswp.c
+++ b/XTrap/xtrapdiswp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991, 1992 by
diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c
index db06e1cc2..3c9385794 100644
--- a/XTrap/xtrapditbl.c
+++ b/XTrap/xtrapditbl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
/****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
diff --git a/Xext/EVI.c b/Xext/EVI.c
index 09aa03b64..99dcf444c 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -21,7 +21,7 @@ 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: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h
index dfe4423f8..645da650a 100644
--- a/Xext/EVIstruct.h
+++ b/Xext/EVIstruct.h
@@ -21,7 +21,7 @@ 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: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
#ifndef EVI_STRUCT_H
#define EVI_STRUCT_H
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 8718e3630..d9796ccd8 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86$ */
/*
Copyright 1996, 1998, 2001 The Open Group
diff --git a/Xext/appgroup.h b/Xext/appgroup.h
index d292cf509..05c9ef124 100644
--- a/Xext/appgroup.h
+++ b/Xext/appgroup.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */
+/* $XFree86$ */
void XagClientStateChange(
CallbackListPtr* pcbl,
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index ae73783d9..2f0c005ae 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "X.h"
diff --git a/Xext/cup.c b/Xext/cup.c
index 70c6fa610..761d5fa7d 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 584c32b22..4c3c1c4f9 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -33,7 +33,7 @@ Equipment Corporation.
* @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00
*/
-/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index b8260491e..57bee2f3e 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86$ */
/* Prototypes for functions that the DDX must provide */
diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index bc85c16ca..ed1366305 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86$ */
typedef int Bool;
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 7c3f5a800..cedbf8843 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -27,7 +27,7 @@
*
* Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $
*/
-/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index 4308037be..aa5eedcd6 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c
index 99400c90a..71d7551e2 100644
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */
+/* $XFree86$ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c
index 9c531c292..6bc306f18 100644
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index b911d7ff5..5fc8ba383 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 89a8a2d2e..4cba2c218 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index d01b0b854..d7f4c77c5 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -19,7 +19,7 @@
* or in FAR 52.227-19, as applicable. *
* *
*****************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */
+/* $XFree86$ */
/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index e3ea803e6..4b0118495 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h
index d15fc8002..202fc7439 100644
--- a/Xext/panoramiXh.h
+++ b/Xext/panoramiXh.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
/*
* Server dispatcher function replacements
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 73a441a88..5cb1229e7 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -26,7 +26,7 @@ Equipment Corporation.
/* Massively rewritten by Mark Vojkovich <markv@valinux.com> */
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 27cbcda52..5a477574d 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */
+/* $XFree86$ */
#ifndef _PANORAMIXSRV_H_
#define _PANORAMIXSRV_H_
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index 15ed9401c..4f23ca383 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -21,7 +21,7 @@ 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: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index 944009773..d2017bf50 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/security.c b/Xext/security.c
index f8e96afad..47ed31cb7 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */
+/* $XFree86$ */
#include "dixstruct.h"
#include "extnsionst.h"
diff --git a/Xext/shape.c b/Xext/shape.c
index 956a8ebfc..d9d8e5743 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/shm.c b/Xext/shm.c
index b81ff5b22..064b7e4c9 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index afde19cba..0ff5d34e0 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86$ */
/* dixsleep.c - implement millisecond timeouts for X clients */
diff --git a/Xext/sync.c b/Xext/sync.c
index 25d360bfa..c5b50a3a1 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index b31057a0d..53439d831 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 1da665af0..0043b6fb5 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86$ */
/*
* BIGFONT extension for sharing font metrics between clients (if possible)
* and for transmitting font metrics to clients in a compressed form.
diff --git a/Xext/xprint.c b/Xext/xprint.c
index e50fb4068..9edbfc13d 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -64,7 +64,7 @@ copyright holders.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86$ */
#define _XP_PRINT_SERVER_
#include "X.h"
diff --git a/Xext/xres.c b/Xext/xres.c
index c024f7be8..a1b7267d6 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -1,7 +1,7 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.8 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 89bcae3a4..855b4bd88 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#define NEED_EVENTS
diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c
index 41c78d9c9..ac23b43d0 100644
--- a/Xext/xtest1dd.c
+++ b/Xext/xtest1dd.c
@@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
University of California.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86$ */
/***************************************************************
* include files
diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h
index 6e258080e..28b268c16 100644
--- a/Xext/xtest1dd.h
+++ b/Xext/xtest1dd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c
index 539d14e30..ce554d17d 100644
--- a/Xext/xtest1di.c
+++ b/Xext/xtest1di.c
@@ -52,7 +52,7 @@ Telephone and Telegraph Company or of the Regents of the
University of California.
*/
-/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */
+/* $XFree86$ */
/*****************************************************************************
* include files
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 40313470c..9dd3196a4 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */
+/* $XFree86$ */
/*
** File:
diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h
index 342a874e8..00af9858b 100644
--- a/Xext/xvdisp.h
+++ b/Xext/xvdisp.h
@@ -1,3 +1,3 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */
+/* $XFree86$ */
extern void XineramifyXv(void);
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 8dafa8b26..5ba743960 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */
+/* $XFree86$ */
#ifndef XVDIX_H
#define XVDIX_H
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 2c3f484bd..82f384996 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */
+/* $XFree86$ */
/*
** File:
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index cb6c06301..bdbd40a08 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index b589c5487..59aa52403 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XVMC_H
#define _XVMC_H
diff --git a/Xi/allowev.c b/Xi/allowev.c
index 2eb463d41..c74bdba04 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/allowev.h b/Xi/allowev.h
index 0202b2cf5..355f09329 100644
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index f5988d76b..e988a825f 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
index 0d15001a0..548ea8a83 100644
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 213fc7bf5..c435bda1d 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
index 4f833617a..47ec80a42 100644
--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index b0b82ee6d..cdc9c4d95 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.6 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
index 5a2cef2c7..63ae5eecb 100644
--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 2b638252f..f5068431d 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
index fd7ed4673..629535974 100644
--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 96ce0bebe..08c2a05c6 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/chgprop.h b/Xi/chgprop.h
index 9df05b4d0..0b202140c 100644
--- a/Xi/chgprop.h
+++ b/Xi/chgprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index c6ece1d65..8305f7968 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.7 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/chgptr.h b/Xi/chgptr.h
index 3168e9710..92a5a29a0 100644
--- a/Xi/chgptr.h
+++ b/Xi/chgptr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 1f7e7dbd2..009380f67 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/closedev.h b/Xi/closedev.h
index 0295b2c8f..89dfe5fad 100644
--- a/Xi/closedev.h
+++ b/Xi/closedev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 98520ec1c..809ad6ace 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/devbell.h b/Xi/devbell.h
index bbf6dea92..ccfe9e4f9 100644
--- a/Xi/devbell.h
+++ b/Xi/devbell.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index d2b2fb58c..187fcba7f 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index f07618b84..5f6714bfa 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 01d51ba64..baeab9d61 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index fb22a1422..bd7545fa5 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/getbmap.h b/Xi/getbmap.h
index 999a7c9f9..ed71e69b1 100644
--- a/Xi/getbmap.h
+++ b/Xi/getbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 5b24bffbe..3b4c670a2 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/getdctl.h b/Xi/getdctl.h
index 0318b4387..2519e129d 100644
--- a/Xi/getdctl.h
+++ b/Xi/getdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 59c2c122b..1fd1cfed9 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/getfctl.h b/Xi/getfctl.h
index 6ba96b066..ed31a4254 100644
--- a/Xi/getfctl.h
+++ b/Xi/getfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index 2b916da11..792997ea9 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/getfocus.h b/Xi/getfocus.h
index d3df5ba5f..fb3857ad6 100644
--- a/Xi/getfocus.h
+++ b/Xi/getfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 4a7a7e296..d820d5b5b 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/getkmap.h b/Xi/getkmap.h
index ebd02f3ef..706569cdc 100644
--- a/Xi/getkmap.h
+++ b/Xi/getkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 67e36b442..c840bddd6 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/getmmap.h b/Xi/getmmap.h
index ff317e0c4..9c3306e0b 100644
--- a/Xi/getmmap.h
+++ b/Xi/getmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getprop.c b/Xi/getprop.c
index a3f3226ea..8134e78f9 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/getprop.h b/Xi/getprop.h
index 452875bd9..633f403be 100644
--- a/Xi/getprop.h
+++ b/Xi/getprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 75b9137a6..42c61a378 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/Xi/getselev.h b/Xi/getselev.h
index 5ed759c29..fa04695fc 100644
--- a/Xi/getselev.h
+++ b/Xi/getselev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getvers.c b/Xi/getvers.c
index c220b5a81..08a18fe2a 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/getvers.h b/Xi/getvers.h
index 2304c6639..9184ab935 100644
--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 80f948de5..1193a759d 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/grabdev.h b/Xi/grabdev.h
index 1eddd24ac..63945cfd7 100644
--- a/Xi/grabdev.h
+++ b/Xi/grabdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index cbc4fd8bd..90aba5044 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h
index 8782c12ac..968499016 100644
--- a/Xi/grabdevb.h
+++ b/Xi/grabdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index d7481801b..29c01df9a 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h
index eb8db9511..4cc210c79 100644
--- a/Xi/grabdevk.h
+++ b/Xi/grabdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 1ddcca3ae..f7b41ce64 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.7 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h
index 7d85e566e..b51db0974 100644
--- a/Xi/gtmotion.h
+++ b/Xi/gtmotion.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/listdev.c b/Xi/listdev.c
index ac4c875a1..ceb7934ef 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.4 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/listdev.h b/Xi/listdev.h
index c9553b692..6ad76b2e3 100644
--- a/Xi/listdev.h
+++ b/Xi/listdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 26210fa86..7da37e13c 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/opendev.h b/Xi/opendev.h
index 818e2d877..4c427ebb6 100644
--- a/Xi/opendev.h
+++ b/Xi/opendev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 598ab85ae..4eb6cc153 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.5 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/queryst.h b/Xi/queryst.h
index 50d36e95e..849031b1c 100644
--- a/Xi/queryst.h
+++ b/Xi/queryst.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/selectev.c b/Xi/selectev.c
index a46a02928..3f6bc778f 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/selectev.h b/Xi/selectev.h
index 2327b94c5..9f20f203f 100644
--- a/Xi/selectev.h
+++ b/Xi/selectev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index ae6f8cdc6..b4bb8a177 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/sendexev.h b/Xi/sendexev.h
index c2ace5804..f4f4b33a4 100644
--- a/Xi/sendexev.h
+++ b/Xi/sendexev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 52553948d..19e109c12 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/setbmap.h b/Xi/setbmap.h
index 77f097104..a7100bd7a 100644
--- a/Xi/setbmap.h
+++ b/Xi/setbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setdval.c b/Xi/setdval.c
index fe2e13853..fcc8ac401 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/setdval.h b/Xi/setdval.h
index e6f08a64c..b3b145f9c 100644
--- a/Xi/setdval.h
+++ b/Xi/setdval.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index 599934549..5a95c13a3 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/setfocus.h b/Xi/setfocus.h
index 1da6927b4..471c7b2b5 100644
--- a/Xi/setfocus.h
+++ b/Xi/setfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 4c4d19c8b..a6b0ec7eb 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
*
diff --git a/Xi/setmmap.h b/Xi/setmmap.h
index 30fb57b48..9176a331b 100644
--- a/Xi/setmmap.h
+++ b/Xi/setmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 9c3feb4db..e25ecfa9f 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/setmode.h b/Xi/setmode.h
index 63a1dd35b..2edff5588 100644
--- a/Xi/setmode.h
+++ b/Xi/setmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 879d8e9b7..b84eec349 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.5 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
/*
* stubs.c -- stub routines for the X server side of the XINPUT
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index a1ab911fe..49ccdaa52 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h
index 9a036901f..f5c7bfec2 100644
--- a/Xi/ungrdev.h
+++ b/Xi/ungrdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 66ccc72af..5b17aa8e4 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h
index 500b77ebb..bc7eef70b 100644
--- a/Xi/ungrdevb.h
+++ b/Xi/ungrdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index d7632db2a..422c1a732 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************************
*
diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h
index c43575ba1..005db46b1 100644
--- a/Xi/ungrdevk.h
+++ b/Xi/ungrdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xprint/AttrValid.c b/Xprint/AttrValid.c
index 83d6b9674..503c41dc5 100644
--- a/Xprint/AttrValid.c
+++ b/Xprint/AttrValid.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */
+/* $XFree86$ */
#include <scrnintstr.h>
diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h
index 87ab48b69..4bc5c110a 100644
--- a/Xprint/AttrValid.h
+++ b/Xprint/AttrValid.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */
+/* $XFree86$ */
#ifndef _Xp_AttrValid_h
#define _Xp_AttrValid_h
diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h
index 3830c20d2..08f19ef79 100644
--- a/Xprint/DiPrint.h
+++ b/Xprint/DiPrint.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */
+/* $XFree86$ */
/*
* The XpDiListEntry struct is the type of each element of the array
diff --git a/Xprint/Init.c b/Xprint/Init.c
index c936f4542..30c340673 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -50,7 +50,7 @@ copyright holders.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */
+/* $XFree86$ */
#include <unistd.h>
#include <stdlib.h>
diff --git a/Xprint/Oid.c b/Xprint/Oid.c
index 4c23a6e09..c98d53840 100644
--- a/Xprint/Oid.c
+++ b/Xprint/Oid.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */
+/* $XFree86$ */
#include "attributes.h"
diff --git a/Xprint/Oid.h b/Xprint/Oid.h
index c5574b06e..1a53a9eac 100644
--- a/Xprint/Oid.h
+++ b/Xprint/Oid.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */
+/* $XFree86$ */
#ifndef _Xp_Oid_h
#define _Xp_Oid_h
diff --git a/Xprint/OidStrs.h b/Xprint/OidStrs.h
index 3aab300dc..eff487926 100644
--- a/Xprint/OidStrs.h
+++ b/Xprint/OidStrs.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86$ */
static int XpOidStringMapCount = 127;
diff --git a/Xprint/Util.c b/Xprint/Util.c
index 9e0bdf925..b1a8e733e 100644
--- a/Xprint/Util.c
+++ b/Xprint/Util.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/Util.c,v 1.13 2001/10/31 22:50:28 tsi Exp $ */
+/* $XFree86$ */
/* To get the tempnam() prototype in <stdio.h> */
#if defined(linux) && defined(__STRICT_ANSI__)
diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c
index 327cb468c..983e5c1c4 100644
--- a/Xprint/ValTree.c
+++ b/Xprint/ValTree.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index e1fce8cb3..f23698f08 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -44,7 +44,7 @@ copyright holders.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */
+/* $XFree86$ */
#include <X11/Xproto.h>
#include <string.h>
diff --git a/Xprint/attributes.h b/Xprint/attributes.h
index d9d551f32..980cfe5e3 100644
--- a/Xprint/attributes.h
+++ b/Xprint/attributes.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/attributes.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86$ */
#ifndef _Xp_attributes_h
#define _Xp_attributes_h 1
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 3d29fd1b1..84ea5c7ac 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/ddxInit.c,v 1.15 2003/06/23 17:35:44 eich Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c
index 7bb08b412..6ad2b20d5 100644
--- a/Xprint/mediaSizes.c
+++ b/Xprint/mediaSizes.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h
index 2af1b2c41..c99590df0 100644
--- a/Xprint/pcl/Pcl.h
+++ b/Xprint/pcl/Pcl.h
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */
+/* $XFree86$ */
#ifndef _PCL_H_
#define _PCL_H_
diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c
index ca13b3a84..676110e33 100644
--- a/Xprint/pcl/PclArc.c
+++ b/Xprint/pcl/PclArc.c
@@ -45,7 +45,7 @@ dealings in this Software without prior written authorization from said
copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <math.h>
diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c
index 971506da6..36f059d61 100644
--- a/Xprint/pcl/PclArea.c
+++ b/Xprint/pcl/PclArea.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <sys/types.h>
diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c
index c279c8024..8a9eef148 100644
--- a/Xprint/pcl/PclColor.c
+++ b/Xprint/pcl/PclColor.c
@@ -45,7 +45,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <string.h>
diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c
index 7e463d498..f6c27af0a 100644
--- a/Xprint/pcl/PclCursor.c
+++ b/Xprint/pcl/PclCursor.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c
index f2141f9ff..d5eff48c7 100644
--- a/Xprint/pcl/PclFonts.c
+++ b/Xprint/pcl/PclFonts.c
@@ -13,7 +13,7 @@
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */
+/* $XFree86$ */
/*
(c) Copyright 1996 Hewlett-Packard Company
(c) Copyright 1996 International Business Machines Corp.
diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c
index e1fe772bd..15ee2d144 100644
--- a/Xprint/pcl/PclGC.c
+++ b/Xprint/pcl/PclGC.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.10 2001/10/28 03:32:54 tsi Exp $ */
+/* $XFree86$ */
#include "gcstruct.h"
diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c
index 5ee49631e..b70af4fd7 100644
--- a/Xprint/pcl/PclInit.c
+++ b/Xprint/pcl/PclInit.c
@@ -76,7 +76,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.12 2002/10/16 21:13:32 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <string.h>
diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c
index 3c10f97ca..6cf3ac6e8 100644
--- a/Xprint/pcl/PclLine.c
+++ b/Xprint/pcl/PclLine.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86$ */
#include "Pcl.h"
#include "gcstruct.h"
diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c
index 5b0939df2..ad2da6b44 100644
--- a/Xprint/pcl/PclMisc.c
+++ b/Xprint/pcl/PclMisc.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86$ */
#include <stdlib.h>
#include <signal.h>
diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c
index 238a159ab..9bccefc7c 100644
--- a/Xprint/pcl/PclPixel.c
+++ b/Xprint/pcl/PclPixel.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c
index ba91fc9ec..e4080786a 100644
--- a/Xprint/pcl/PclPixmap.c
+++ b/Xprint/pcl/PclPixmap.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86$ */
#include "Pcl.h"
#include "cfb.h"
diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c
index a5de77399..0a0f370e8 100644
--- a/Xprint/pcl/PclPolygon.c
+++ b/Xprint/pcl/PclPolygon.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86$ */
#include "Pcl.h"
diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c
index aa2164c92..117658560 100644
--- a/Xprint/pcl/PclPrint.c
+++ b/Xprint/pcl/PclPrint.c
@@ -43,7 +43,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <string.h>
diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c
index 3c7cf05af..cd3758ba6 100644
--- a/Xprint/pcl/PclSFonts.c
+++ b/Xprint/pcl/PclSFonts.c
@@ -45,7 +45,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.8 2003/12/22 17:48:05 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c
index 98c17dcf9..9be028cf2 100644
--- a/Xprint/pcl/PclSpans.c
+++ b/Xprint/pcl/PclSpans.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */
+/* $XFree86$ */
#include "Pcl.h"
diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c
index 48b468427..6cac9f9f5 100644
--- a/Xprint/pcl/PclText.c
+++ b/Xprint/pcl/PclText.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86$ */
#ifdef DO_TWO_BYTE_PCL
#include "iconv.h"
diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c
index 27d8ea97d..ae5ae211f 100644
--- a/Xprint/pcl/PclWindow.c
+++ b/Xprint/pcl/PclWindow.c
@@ -44,7 +44,7 @@ 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: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h
index 1386b0ab4..a6b4ac08a 100644
--- a/Xprint/pcl/Pclmap.h
+++ b/Xprint/pcl/Pclmap.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */
+/* $XFree86$ */
#ifndef _PCLMAP_H_
#define _PCLMAP_H_
diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h
index 7b0aaeb39..8529012ab 100644
--- a/Xprint/ps/Ps.h
+++ b/Xprint/ps/Ps.h
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */
+/* $XFree86$ */
#ifndef _PS_H_
#define _PS_H_
diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c
index a6a375487..2db019e11 100644
--- a/Xprint/ps/PsAttVal.c
+++ b/Xprint/ps/PsAttVal.c
@@ -32,7 +32,7 @@ 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: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.5 2001/12/19 21:28:44 dawes Exp $ */
+/* $XFree86$ */
#include "Ps.h"
#include "AttrValid.h"
diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c
index 13c4e1978..d89442a92 100644
--- a/Xprint/ps/PsAttr.c
+++ b/Xprint/ps/PsAttr.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
* or other dealings in this Software without prior written authorization
* from said copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.5 2001/12/14 19:59:15 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c
index 92082226f..9b83d734d 100644
--- a/Xprint/ps/PsColor.c
+++ b/Xprint/ps/PsColor.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.3 2001/12/14 19:59:15 dawes Exp $ */
+/* $XFree86$ */
#include "Ps.h"
#include "gcstruct.h"
diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c
index 9792dae4d..64091f3c0 100644
--- a/Xprint/ps/PsFonts.c
+++ b/Xprint/ps/PsFonts.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
* or other dealings in this Software without prior written authorization
* from said copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c
index 1c2877231..365643a57 100644
--- a/Xprint/ps/PsGC.c
+++ b/Xprint/ps/PsGC.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
* or other dealings in this Software without prior written authorization
* from said copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c
index 193fc0518..6d557923c 100644
--- a/Xprint/ps/PsInit.c
+++ b/Xprint/ps/PsInit.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <string.h>
diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c
index ff4c6da80..ac4d178e9 100644
--- a/Xprint/ps/PsLine.c
+++ b/Xprint/ps/PsLine.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */
+/* $XFree86$ */
#include "Ps.h"
#include "gcstruct.h"
diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c
index 75f692d56..f380f750c 100644
--- a/Xprint/ps/PsMisc.c
+++ b/Xprint/ps/PsMisc.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xos.h" /* for SIGCLD on pre-POSIX systems */
#include <stdio.h>
diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c
index 09a89fa2d..dc5f275b0 100644
--- a/Xprint/ps/PsPixel.c
+++ b/Xprint/ps/PsPixel.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c
index 2e821aa1c..33e7a1b80 100644
--- a/Xprint/ps/PsPixmap.c
+++ b/Xprint/ps/PsPixmap.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
* or other dealings in this Software without prior written authorization
* from said copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.5 2001/12/14 19:59:16 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
** *********************************************************
diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c
index 0cd826f43..751e21ebc 100644
--- a/Xprint/ps/PsPolygon.c
+++ b/Xprint/ps/PsPolygon.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.7 2001/12/14 19:59:17 dawes Exp $ */
+/* $XFree86$ */
#include "Ps.h"
#include "gcstruct.h"
diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c
index 8a06205e5..1269cf83f 100644
--- a/Xprint/ps/PsPrint.c
+++ b/Xprint/ps/PsPrint.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <string.h>
diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c
index 32ca58d20..e5592a5e8 100644
--- a/Xprint/ps/PsSpans.c
+++ b/Xprint/ps/PsSpans.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.9 2001/12/14 19:59:17 dawes Exp $ */
+/* $XFree86$ */
#include "Ps.h"
#include "gcstruct.h"
diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c
index b04d910d5..f4adb698e 100644
--- a/Xprint/ps/PsText.c
+++ b/Xprint/ps/PsText.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
+/* $XFree86$ */
#include "Ps.h"
#include "gcstruct.h"
diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c
index e39b602cb..40e3edff3 100644
--- a/Xprint/ps/PsWindow.c
+++ b/Xprint/ps/PsWindow.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <string.h>
diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c
index f1507d849..3f3c57724 100644
--- a/Xprint/ps/psout.c
+++ b/Xprint/ps/psout.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
** *********************************************************
**
********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.12 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86$ */
/*
* For XFree86 3.3.3:
diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h
index 2fe83ffc7..b570fdaba 100644
--- a/Xprint/ps/psout.h
+++ b/Xprint/ps/psout.h
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
* or other dealings in this Software without prior written authorization
* from said copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.5 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c
index d306dea21..4e55fd5bd 100644
--- a/Xprint/raster/Raster.c
+++ b/Xprint/raster/Raster.c
@@ -31,7 +31,7 @@ dealings in this Software without prior written authorization from said
copyright holders.
*/
-/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h
index 0533cd5b2..6cbb19f96 100644
--- a/Xprint/raster/Raster.h
+++ b/Xprint/raster/Raster.h
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.4 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
**
diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c
index 7cce3f22a..687b012b0 100644
--- a/Xprint/raster/RasterAttVal.c
+++ b/Xprint/raster/RasterAttVal.c
@@ -30,7 +30,7 @@ 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: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.4 2001/12/21 21:02:06 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/afb/afb.h b/afb/afb.h
index 1f6401782..545c90731 100644
--- a/afb/afb.h
+++ b/afb/afb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.11 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c
index 7f04a7de0..f7e5f9ace 100644
--- a/afb/afbbitblt.c
+++ b/afb/afbbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.6 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbblt.c b/afb/afbblt.c
index c0b48130e..84fdb4159 100644
--- a/afb/afbblt.c
+++ b/afb/afbblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.1 2001/10/28 03:32:57 tsi Exp $ */
+/* $XFree86$ */
/*
* afb copy area
*/
diff --git a/afb/afbbres.c b/afb/afbbres.c
index 227f3bc1f..732ea65fa 100644
--- a/afb/afbbres.c
+++ b/afb/afbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.0 1996/08/18 01:45:25 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbbresd.c b/afb/afbbresd.c
index 57309175e..581ecb84f 100644
--- a/afb/afbbresd.c
+++ b/afb/afbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.0 1996/08/18 01:45:26 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbbstore.c b/afb/afbbstore.c
index 725f93d48..c3e844d57 100644
--- a/afb/afbbstore.c
+++ b/afb/afbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.0 1996/08/18 01:45:28 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/*
diff --git a/afb/afbclip.c b/afb/afbclip.c
index 07eb3b816..753d3ccda 100644
--- a/afb/afbclip.c
+++ b/afb/afbclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.3 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbcmap.c b/afb/afbcmap.c
index e56558972..e83bc404c 100644
--- a/afb/afbcmap.c
+++ b/afb/afbcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.1 1998/11/22 10:36:58 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c
index 1db48b07c..6fe46adef 100644
--- a/afb/afbfillarc.c
+++ b/afb/afbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c
index 25ab5e56e..1e64c2afa 100644
--- a/afb/afbfillrct.c
+++ b/afb/afbfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c
index 69985aebc..4ed8006ea 100644
--- a/afb/afbfillsp.c
+++ b/afb/afbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.4 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbfont.c b/afb/afbfont.c
index 0ad8d9de3..5df6691c5 100644
--- a/afb/afbfont.c
+++ b/afb/afbfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.0 1996/08/18 01:45:35 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/afb/afbgc.c b/afb/afbgc.c
index fe88475a3..369bad905 100644
--- a/afb/afbgc.c
+++ b/afb/afbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c
index 0fa825d21..d778d42d8 100644
--- a/afb/afbgetsp.c
+++ b/afb/afbgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c
index b50c357b4..bc5c49bae 100644
--- a/afb/afbhrzvert.c
+++ b/afb/afbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.1 2001/08/01 00:44:47 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbimage.c b/afb/afbimage.c
index cfb230e36..d3500d18a 100644
--- a/afb/afbimage.c
+++ b/afb/afbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "windowstr.h"
diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c
index 60d212ca0..72bc79ef8 100644
--- a/afb/afbimggblt.c
+++ b/afb/afbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.2 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbline.c b/afb/afbline.c
index 796ddffeb..7bf7ccf1a 100644
--- a/afb/afbline.c
+++ b/afb/afbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbmisc.c b/afb/afbmisc.c
index c0ae1c545..4928a84d3 100644
--- a/afb/afbmisc.c
+++ b/afb/afbmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.0 1996/08/18 01:45:44 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
index fe0d8bc79..cf2e1d92e 100644
--- a/afb/afbpixmap.c
+++ b/afb/afbpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1 1997/06/03 14:11:07 hohndel Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c
index c0c2065f1..5b5454c30 100644
--- a/afb/afbply1rct.c
+++ b/afb/afbply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
*
diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c
index 3938433c3..e0abdf322 100644
--- a/afb/afbplygblt.c
+++ b/afb/afbplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c
index 239346ceb..878c84b0c 100644
--- a/afb/afbpntarea.c
+++ b/afb/afbpntarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
index 17d924059..bb84e676a 100644
--- a/afb/afbpntwin.c
+++ b/afb/afbpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.0 1996/08/18 01:45:50 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c
index b09f3b037..29a39ffa1 100644
--- a/afb/afbpolypnt.c
+++ b/afb/afbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c
index d556acd8c..944768d44 100644
--- a/afb/afbpushpxl.c
+++ b/afb/afbpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c
index d2b3fd02b..93e74f31e 100644
--- a/afb/afbscrinit.c
+++ b/afb/afbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.5 1998/11/22 10:36:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c
index 93331b857..d6144d221 100644
--- a/afb/afbsetsp.c
+++ b/afb/afbsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c
index b12eeb252..f66b89f44 100644
--- a/afb/afbtegblt.c
+++ b/afb/afbtegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */
+/* $XFree86$ */
/* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbtile.c b/afb/afbtile.c
index 3b861b822..ebeb05cb3 100644
--- a/afb/afbtile.c
+++ b/afb/afbtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.4 2003/10/29 22:15:19 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbwindow.c b/afb/afbwindow.c
index 024fc04b6..33a0bc64e 100644
--- a/afb/afbwindow.c
+++ b/afb/afbwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.1 2003/09/13 21:33:04 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c
index db1bd2bfd..ec4119c04 100644
--- a/afb/afbzerarc.c
+++ b/afb/afbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.3 2003/07/16 01:38:36 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/cfb/cfb.h b/cfb/cfb.h
index b7d027905..9ceffc6d6 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.30 2003/07/19 13:22:27 tsi Exp $ */
+/* $XFree86$ */
#if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY)
diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c
index 1dd742c60..5b19894c2 100644
--- a/cfb/cfb8bit.c
+++ b/cfb/cfb8bit.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */
+/* $XFree86$ */
/*
* cfb8bit.c
diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h
index 0c6b51925..d2b6ca4d3 100644
--- a/cfb/cfb8bit.h
+++ b/cfb/cfb8bit.h
@@ -7,7 +7,7 @@
* are used for depths other than 8. Perhaps the file should be
* renamed. dpw
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.8 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c
index 01c412b97..e8a5bd650 100644
--- a/cfb/cfb8line.c
+++ b/cfb/cfb8line.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*
- * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.19 2003/10/29 22:44:52 tsi Exp $
+ * $XFree86$
* Jeff Anton'x fixes: cfb8line.c 97/02/07
*/
diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c
index 6c2fa30f3..1d5cd0f87 100644
--- a/cfb/cfballpriv.c
+++ b/cfb/cfballpriv.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.12 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c
index 18f90f1fd..15001fa5f 100644
--- a/cfb/cfbbitblt.c
+++ b/cfb/cfbbitblt.c
@@ -2,7 +2,7 @@
* cfb copy area
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.20 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c
index 5d2e084fd..bb07a0a9f 100644
--- a/cfb/cfbblt.c
+++ b/cfb/cfbblt.c
@@ -1,7 +1,7 @@
/*
* cfb copy area
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c
index 452259581..f62008817 100644
--- a/cfb/cfbbres.c
+++ b/cfb/cfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c
index 7fe71fa2f..c73cef0db 100644
--- a/cfb/cfbbresd.c
+++ b/cfb/cfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c
index 5e7b91471..724504f31 100644
--- a/cfb/cfbbstore.c
+++ b/cfb/cfbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */
+/* $XFree86$ */
/*-
* cfbbstore.c --
* Functions required by the backing-store implementation in MI.
diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c
index 1830ffa5e..a14503c62 100644
--- a/cfb/cfbcmap.c
+++ b/cfb/cfbcmap.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c
index ee4c18fdc..df6b996d3 100644
--- a/cfb/cfbcppl.c
+++ b/cfb/cfbcppl.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.7 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c
index 64ec508c8..b58ac2dcb 100644
--- a/cfb/cfbfillarc.c
+++ b/cfb/cfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c
index c6a7270c2..638db3216 100644
--- a/cfb/cfbfillrct.c
+++ b/cfb/cfbfillrct.c
@@ -1,7 +1,7 @@
/*
* Fill rectangles.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c
index 14a6a9d52..b2373de60 100644
--- a/cfb/cfbfillsp.c
+++ b/cfb/cfbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c
index c2e7a5965..1bb7b8bb2 100644
--- a/cfb/cfbgc.c
+++ b/cfb/cfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c
index 737f30237..fffc3f7cc 100644
--- a/cfb/cfbgetsp.c
+++ b/cfb/cfbgetsp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c
index 60a012c28..0cb229b0f 100644
--- a/cfb/cfbglblt8.c
+++ b/cfb/cfbglblt8.c
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */
+/* $XFree86$ */
/*
* Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode
diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c
index 6f4f7abe6..e5a2373e8 100644
--- a/cfb/cfbhrzvert.c
+++ b/cfb/cfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987,1998 The Open Group
diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c
index aa1060240..eaba7a2a2 100644
--- a/cfb/cfbigblt8.c
+++ b/cfb/cfbigblt8.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c
index 1983ae48a..babc2962b 100644
--- a/cfb/cfbimage.c
+++ b/cfb/cfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/cfb/cfbline.c b/cfb/cfbline.c
index 432cb62d9..ba4e72b15 100644
--- a/cfb/cfbline.c
+++ b/cfb/cfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h
index 42056345a..6c44c60e9 100644
--- a/cfb/cfbmap.h
+++ b/cfb/cfbmap.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.12 2003/07/19 13:22:27 tsi Exp $ */
+/* $XFree86$ */
/*
* Map names around so that multiple depths can be supported simultaneously
diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c
index cbf364770..d72aed75f 100644
--- a/cfb/cfbmskbits.c
+++ b/cfb/cfbmskbits.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h
index b7f9969dd..aefb994f3 100644
--- a/cfb/cfbmskbits.h
+++ b/cfb/cfbmskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c
index bd2e1b6f1..b1a5c7664 100644
--- a/cfb/cfbpixmap.c
+++ b/cfb/cfbpixmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
/* pixmap management
written by drewry, september 1986
diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c
index 0b14bc614..4bc51c8dc 100644
--- a/cfb/cfbply1rct.c
+++ b/cfb/cfbply1rct.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.11 2003/10/30 14:53:39 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c
index c77d01961..e039e1eb7 100644
--- a/cfb/cfbpntwin.c
+++ b/cfb/cfbpntwin.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c
index d8b781397..8f06c8d53 100644
--- a/cfb/cfbpolypnt.c
+++ b/cfb/cfbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c
index 0de172f03..a34c5eca8 100644
--- a/cfb/cfbpush8.c
+++ b/cfb/cfbpush8.c
@@ -2,7 +2,7 @@
* Push Pixels for 8 bit displays.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c
index 7f6e93919..9b9859abc 100644
--- a/cfb/cfbrctstp8.c
+++ b/cfb/cfbrctstp8.c
@@ -1,7 +1,7 @@
/*
* Fill 32 bit stippled rectangles for 8 bit frame buffers
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c
index 1ee6771e0..5a0b8180a 100644
--- a/cfb/cfbrrop.c
+++ b/cfb/cfbrrop.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
/* cfb reduced rasterop computations */
diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h
index d8dce082c..a41f1220f 100644
--- a/cfb/cfbrrop.h
+++ b/cfb/cfbrrop.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.11 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
#ifndef GXcopy
#include "X.h"
diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c
index 7e0d15dd4..0e3e2c5bc 100644
--- a/cfb/cfbscrinit.c
+++ b/cfb/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.20 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c
index 4f7dfaee1..3263ea692 100644
--- a/cfb/cfbsetsp.c
+++ b/cfb/cfbsetsp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.6 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c
index f0a3e361e..690c2b2f3 100644
--- a/cfb/cfbsolid.c
+++ b/cfb/cfbsolid.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.9 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h
index 5c4f1c445..c27f69312 100644
--- a/cfb/cfbtab.h
+++ b/cfb/cfbtab.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbtab.h,v 1.1 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
#ifndef _CFBTAB_H_
#define _CFBTAB_H_
diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c
index 0cdbddc7a..b37a3371c 100644
--- a/cfb/cfbteblt8.c
+++ b/cfb/cfbteblt8.c
@@ -3,7 +3,7 @@
* 8 bit displays, in Copy mode with no clipping.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.6 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c
index 7450c7829..53f75b8f1 100644
--- a/cfb/cfbtegblt.c
+++ b/cfb/cfbtegblt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c
index b202943e8..afc2fd735 100644
--- a/cfb/cfbtile32.c
+++ b/cfb/cfbtile32.c
@@ -2,7 +2,7 @@
* Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow.
* no depth dependencies.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c
index e372fe87d..49a3b4ab4 100644
--- a/cfb/cfbtileodd.c
+++ b/cfb/cfbtileodd.c
@@ -2,7 +2,7 @@
* Fill odd tiled rectangles and spans.
* no depth dependencies.
*/
-/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/*
diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c
index cae13cf3c..9e9601070 100644
--- a/cfb/cfbwindow.c
+++ b/cfb/cfbwindow.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.6 2003/11/10 18:21:45 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c
index 3703a5105..81f181443 100644
--- a/cfb/cfbzerarc.c
+++ b/cfb/cfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.5 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h
index 9a2bac720..15b68d18e 100644
--- a/cfb/stip68kgnu.h
+++ b/cfb/stip68kgnu.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.4 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86$ */
/*
* Stipple stack macro for 68k GCC
diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s
index 185795605..e3af29374 100644
--- a/cfb/stipsparc.s
+++ b/cfb/stipsparc.s
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */
+/* $XFree86$ */
/*
* SPARC assembly code for optimized text rendering.
diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s
index f878fbf80..d34c71614 100644
--- a/cfb/stipsprc32.s
+++ b/cfb/stipsprc32.s
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */
+/* $XFree86$ */
/*
* SPARC assembly code for optimized text rendering.
diff --git a/cfb24/cfbrrop24.h b/cfb24/cfbrrop24.h
index 0bb97ce5b..935b96b71 100644
--- a/cfb24/cfbrrop24.h
+++ b/cfb24/cfbrrop24.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.2 2003/10/29 22:46:27 tsi Exp $ */
+/* $XFree86$ */
#define RROP_DECLARE \
unsigned long piQxelAnd[3], piQxelXor[3], spiQxelXor[8];
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 6b92baac7..4f5fbc890 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -30,7 +30,7 @@
* DIX DBE code
*
*****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.11 2001/10/28 03:33:04 tsi Exp $ */
+/* $XFree86$ */
/* INCLUDES */
diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
index 3634fe7d7..f176c6fd1 100644
--- a/dbe/dbestruct.h
+++ b/dbe/dbestruct.h
@@ -30,7 +30,7 @@
* Header file for DIX-related DBE
*
*****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
#ifndef DBE_STRUCT_H
diff --git a/dbe/midbe.c b/dbe/midbe.c
index e7617e728..ff3ad5993 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -30,7 +30,7 @@
* Machine-independent DBE code
*
*****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.5 2001/08/23 14:19:24 alanh Exp $ */
+/* $XFree86$ */
/* INCLUDES */
diff --git a/dbe/midbe.h b/dbe/midbe.h
index 7b1237633..3f9bb0090 100644
--- a/dbe/midbe.h
+++ b/dbe/midbe.h
@@ -30,7 +30,7 @@
* Header file for users of machine-independent DBE code
*
*****************************************************************************/
-/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
#ifndef MIDBE_H
diff --git a/dix/atom.c b/dix/atom.c
index 66c045583..7d7bf8e60 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.4 2002/02/19 11:09:21 alanh Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/colormap.c b/dix/colormap.c
index af959ed86..f0e290433 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/cursor.c b/dix/cursor.c
index 2ef9e5e24..778a84ed7 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.9 2003/11/17 22:20:33 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/devices.c b/dix/devices.c
index 46af5eabc..3a4c3b976 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.21 2003/11/17 22:20:33 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/dispatch.c b/dix/dispatch.c
index cd1ce6790..c3d0baedd 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -68,7 +68,7 @@ SOFTWARE.
* *
*****************************************************************/
-/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.33 2003/11/17 22:20:33 dawes Exp $ */
+/* $XFree86$ */
#ifdef PANORAMIX_DEBUG
#include <stdio.h>
diff --git a/dix/dispatch.h b/dix/dispatch.h
index d144c6c70..3f59c1968 100644
--- a/dix/dispatch.h
+++ b/dix/dispatch.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.3 2002/02/19 11:09:21 alanh Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index d971260c7..bd66cdd2c 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86$ */
/************************************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 38cfd4e0d..8f9c9b760 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/events.c b/dix/events.c
index 2853e1013..e3e11155f 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.52 2004/01/23 07:23:34 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/extension.c b/dix/extension.c
index 36f053f02..ac263a957 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/gc.c b/dix/gc.c
index 11f215c8d..985dd5a07 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.10 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/globals.c b/dix/globals.c
index 29926308a..3f5018bec 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/grabs.c b/dix/grabs.c
index 7a9fbcdb5..eb8bc259f 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.5 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "misc.h"
diff --git a/dix/main.c b/dix/main.c
index 37add2a62..815259513 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/pixmap.c b/dix/pixmap.c
index fda07801c..0ec7ed346 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.5 2001/12/14 19:59:32 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/dix/privates.c b/dix/privates.c
index 2d0885846..9ec902f75 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.8 2001/12/14 19:59:32 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/dix/property.c b/dix/property.c
index 1af6156b5..b708b78a3 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.13 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/resource.c b/dix/resource.c
index d885c03ef..60cd4b32e 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -72,7 +72,7 @@ SOFTWARE.
* 1, and an otherwise arbitrary ID in the low 22 bits, we can create a
* resource "owned" by the client.
*/
-/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "X.h"
diff --git a/dix/swaprep.c b/dix/swaprep.c
index 494471730..843b9f739 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.8 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 358ec8139..ab0ab3e58 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/tables.c b/dix/tables.c
index a76bc7535..fd9deb0e6 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.6 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/dix/window.c b/dix/window.c
index 0ed9cb083..837ffea33 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -70,7 +70,7 @@ SOFTWARE.
* *
*****************************************************************/
-/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.37 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "scrnintstr.h"
diff --git a/dix/xpstubs.c b/dix/xpstubs.c
index a48a81402..ab30dad9f 100644
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */
+/* $XFree86$ */
/*
Copyright 1996, 1998 The Open Group
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index 4a24ac9a2..d4067635a 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -22,7 +22,7 @@
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
-.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.32 2004/01/12 21:43:19 herrb Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH XSERVER 1 __xorgversion__
diff --git a/doc/smartsched b/doc/smartsched
index 3d5a84b9b..65a2c9ed7 100644
--- a/doc/smartsched
+++ b/doc/smartsched
@@ -201,4 +201,4 @@ response and benchmark numbers at the same time.
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/smartsched,v 1.2 1999/11/19 14:59:16 hohndel Exp $
+$XFree86$
diff --git a/fb/fb.h b/fb/fb.h
index c9633d248..6e1aab5d3 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86$
*
* Copyright © 1998 Keith Packard
*
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 1f9e843cf..17bb2180c 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.5 2001/05/29 04:54:08 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/fb/fb24_32.h b/fb/fb24_32.h
index d0a0acb97..80034aa25 100644
--- a/fb/fb24_32.h
+++ b/fb/fb24_32.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fb24_32.h,v 1.1 2000/04/04 19:24:49 dawes Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 687de493a..a18ff97e6 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.4 2000/05/06 21:09:31 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbarc.c b/fb/fbarc.c
index 9713ffb09..9ce8c75b4 100644
--- a/fb/fbarc.c
+++ b/fb/fbarc.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.8 2002/11/09 04:59:29 tsi Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "mizerarc.h"
diff --git a/fb/fbbits.c b/fb/fbbits.c
index b1c123d21..107337480 100644
--- a/fb/fbbits.c
+++ b/fb/fbbits.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.6 2000/02/23 20:29:41 dawes Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "miline.h"
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 80fbc4010..4f9d04e62 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86$
*
* Copyright © 1998 Keith Packard
*
diff --git a/fb/fbblt.c b/fb/fbblt.c
index b1fd5f5b0..65cc9b63e 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbbltone.c b/fb/fbbltone.c
index e758794b8..4ce2ee430 100644
--- a/fb/fbbltone.c
+++ b/fb/fbbltone.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.13 2002/02/23 00:42:07 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbbstore.c b/fb/fbbstore.c
index 07a6400a8..1866e53db 100644
--- a/fb/fbbstore.c
+++ b/fb/fbbstore.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.2 2000/02/23 20:29:42 dawes Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbcmap.c b/fb/fbcmap.c
index aeb53b1fb..d47ccb42a 100644
--- a/fb/fbcmap.c
+++ b/fb/fbcmap.c
@@ -1,5 +1,5 @@
/* $XConsortium: fbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
-/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.6 2001/10/28 03:33:08 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 4938f89d0..6ac3175df 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index 6dd48a786..1e64b8896 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.14 2003/12/28 17:22:25 alanh Exp $ */
+/* $XFree86$ */
#include "fb.h"
#ifdef IN_MODULE
diff --git a/fb/fbfill.c b/fb/fbfill.c
index 8ecb3cde6..d30870b69 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c
index d0468e041..c6299a747 100644
--- a/fb/fbfillrect.c
+++ b/fb/fbfillrect.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c
index 29c3a36b0..f034d89d8 100644
--- a/fb/fbfillsp.c
+++ b/fb/fbfillsp.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbgc.c b/fb/fbgc.c
index 1e9eb5aa3..853e358e8 100644
--- a/fb/fbgc.c
+++ b/fb/fbgc.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
+/* $XFree86$ */
#include "fb.h"
#ifdef IN_MODULE
diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c
index db35f6d5c..7c5d14e65 100644
--- a/fb/fbgetsp.c
+++ b/fb/fbgetsp.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.6 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 3ad8d2507..7c05119ad 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
+ * $XFree86$
*
* Copyright © 1998 Keith Packard
*
diff --git a/fb/fbimage.c b/fb/fbimage.c
index 7d0284c38..5868efec4 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.8 2001/09/07 15:15:31 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
#ifdef XFree86LOADER
diff --git a/fb/fbline.c b/fb/fbline.c
index 957222492..d48780100 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.8 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86$
*
* Copyright © 1998 Keith Packard
*
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 00521eef2..233325f60 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/fb/fboverlay.h b/fb/fboverlay.h
index 3dca8a3a4..f433cbc8f 100644
--- a/fb/fboverlay.h
+++ b/fb/fboverlay.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.5 2002/09/19 13:22:00 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 894d5cd62..2ecad90cb 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.16 2002/12/14 01:46:02 dawes Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/fb/fbpict.h b/fb/fbpict.h
index fd911b078..6ca28bdb6 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.11 2002/09/26 02:56:48 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 757406c21..a0eaa78a4 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.11 2002/09/16 18:05:34 eich Exp $ */
+/* $XFree86$ */
#include "fb.h"
#ifdef IN_MODULE
diff --git a/fb/fbpoint.c b/fb/fbpoint.c
index 20426a9f1..7d09059dd 100644
--- a/fb/fbpoint.c
+++ b/fb/fbpoint.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbpush.c b/fb/fbpush.c
index 4ae60764c..065e3fd38 100644
--- a/fb/fbpush.c
+++ b/fb/fbpush.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbrop.h b/fb/fbrop.h
index 9481be680..8c87777a2 100644
--- a/fb/fbrop.h
+++ b/fb/fbrop.h
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.4 2000/02/23 20:29:46 dawes Exp $ */
+/* $XFree86$ */
#ifndef _FBROP_H_
#define _FBROP_H_
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index bdcc9d139..677ccf13a 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 284f11fa9..753bc4ac1 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "miline.h"
diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c
index e207760c6..85cc1ee1c 100644
--- a/fb/fbsetsp.c
+++ b/fb/fbsetsp.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 17b5bffe0..a325da0c2 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $
+ * $XFree86$
*
* Copyright © 1998 Keith Packard
*
diff --git a/fb/fbstipple.c b/fb/fbstipple.c
index 88f694bb8..832da75e2 100644
--- a/fb/fbstipple.c
+++ b/fb/fbstipple.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.7 2001/10/28 03:33:08 tsi Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbtile.c b/fb/fbtile.c
index ed447f8d3..9a41a63e3 100644
--- a/fb/fbtile.c
+++ b/fb/fbtile.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 3a44d53ef..6e3a4d7c6 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.10 2002/09/27 00:31:24 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 University of Southern California
*
diff --git a/fb/fbutil.c b/fb/fbutil.c
index 54b88ad7e..73e06696f 100644
--- a/fb/fbutil.c
+++ b/fb/fbutil.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.5 2001/03/28 14:37:03 alanh Exp $ */
+/* $XFree86$ */
#include "fb.h"
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 262716543..35243e8a1 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.11 2003/11/10 18:21:47 tsi Exp $ */
+/* $XFree86$ */
#include "fb.h"
#ifdef IN_MODULE
diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man
index a718e41ce..77cbcbe6a 100644
--- a/hw/darwin/XDarwin.man
+++ b/hw/darwin/XDarwin.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $
+.\" $XFree86$
.\"
.TH XDARWIN 1 __vendorversion__
.SH NAME
diff --git a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
index e7ca52c2c..94f0777ae 100644
--- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
@@ -1 +1 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/19 01:21:32 torrey Exp $ --> #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif <html> <head> <title>XFree86 voor Mac OS X</title> </head> <body> <center> <h1>XFree86 voor Darwin en Mac OS X</h1> XFree86 XF86_VERSION<br> Release Date: XF86_REL_DATE </center> <h2>Inhoud</h2> <ol> <li><A HREF="#notice">Belangrijke Informatie</A></li> <li><A HREF="#usage">Gebruik</A></li> <li><A HREF="#path">Instellen van het Path</A></li> <li><A HREF="#prefs">Voorkeursinstellingen</A></li> <li><A HREF="#license">Licentie</A></li> </ol> <center> <h2><a NAME="notice">Belangrijke Informatie</a></h2> </center> <blockquote> #if PRE_RELEASE Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is. Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of in de <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>. #else Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt. Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge. #endif </blockquote> <blockquote> Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote> <h2><a NAME="usage">Gebruik</a></h2> <p>XFree86 is een open-source uitvoering van het <a HREF="http://www.x.org/">X Window Systeem</a>, verzorgd door <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>, die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin. XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p> <p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen. (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p> <p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p> <h3>Meerknopsmuis emulatie</h3> <p>Voor veel X11 programma's hebt u een 3-knops muis nodig. Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis. Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen". Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3. Deze toetsen kunt u dus wijzigen in de Voorkeuren. Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p> <h2><a NAME="path">Instellen van het Path</a></h2> <p>Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd. XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p> <p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell. In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen. XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven). Het instellen van het path is afhankelijk van de shell. Zie hiervoor de man pages voor de shell.</p> <p>Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt. De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p> <h2><a NAME="prefs">Voorkeursinstellingen</a></h2> <p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu. Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart. Een wijziging van de overige instellingen is direct effectief. Hier onder vindt u de verschillende mogelijkheden beschreven:</p> <h3>Algemeen</h3> <ul> <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li> <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen. Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld. Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li> <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>. Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li> </ul> <h3>Start</h3> <ul> <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li> <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus. Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li> <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer. Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li> <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm. U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren. Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li> <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li> <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>"). Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd. U kunt meerdere directories opgeven, gescheiden door een dubbelepunt. X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell. U kunt een afwijkende shell opgeven.</li> </ul> <h3>Schermvullend</h3> <ul> <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt. Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li> <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen. In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li> <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li> <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop). Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua. U kunt ook kiezen voor 8, 15 of 24 bits.</li> </ul> <h2><a NAME="license">Licentie</a></h2> The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86 License page</A>. <H3><A NAME="3"></A>X Consortium License</H3> <p>Copyright (C) 1996 X Consortium</p> <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p> <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.</p> <p>Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.</p> <p>X Window System is a trademark of X Consortium, Inc.</p> </body> </html> \ No newline at end of file
+<!-- $XFree86$ --> #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif <html> <head> <title>XFree86 voor Mac OS X</title> </head> <body> <center> <h1>XFree86 voor Darwin en Mac OS X</h1> XFree86 XF86_VERSION<br> Release Date: XF86_REL_DATE </center> <h2>Inhoud</h2> <ol> <li><A HREF="#notice">Belangrijke Informatie</A></li> <li><A HREF="#usage">Gebruik</A></li> <li><A HREF="#path">Instellen van het Path</A></li> <li><A HREF="#prefs">Voorkeursinstellingen</A></li> <li><A HREF="#license">Licentie</A></li> </ol> <center> <h2><a NAME="notice">Belangrijke Informatie</a></h2> </center> <blockquote> #if PRE_RELEASE Dit is een pre-release van XFree86, waarvoor geen ondersteuning beschikbaar is. Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> of in de <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>. #else Als de server ouder is dan 6-12 maanden, of als uw hardware nieuwer is dan de bovenstaande datum, kijk dan of een nieuwe versie beschikbaar is voor u een probleem aanmeldt. Rapporteren van bugs en aanleveren van patches kan op de <A HREF="http://sourceforge.net/projects/xonx/">XonX project pagina</A> bij SourceForge. #endif </blockquote> <blockquote> Deze software is beschikbaar gesteld onder de voorwaarden van de <A HREF="#license">MIT X11 / X Consortium Licentie</A> en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de <A HREF="#license">Licentie</A> voor gebruik.</blockquote> <h2><a NAME="usage">Gebruik</a></h2> <p>XFree86 is een open-source uitvoering van het <a HREF="http://www.x.org/">X Window Systeem</a>, verzorgd door <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>, die vrij verspreid mag worden. De X window server voor Darwin en Mac OS X verzorgd door XFree86 heet XDarwin. XDarwin werkt op Mac OS X in schermvullende of rootless modus.</p> <p>Het X window systeem in schermvullende modus neemt het hele beeldscherm in beslag. U schakelt terug naar de Mac OS X desktop door de toesten Command-Option-A in te drukken. Deze toetsencombinatie kunt u veranderen in de Voorkeuren. Op de Mac OS X desktop klikt u op de XDarwin icoon in de Dock om weer naar het X window systeem te schakelen. (In de Voorkeuren kunt er voor kiezen om een apart XDarwin schakelpaneel te gebruiken op de Mac OS X desktop.)</p> <p>In rootless modus verschijnen het X window systeem en Aqua (de Mac OS X desktop) tegelijk op het scherm. Het achtergrondscherm van X11, waarbinnen alle X11 vensters vallen, is net zo groot als het gehele scherm, maar het achtergrondscherm zelf is onzichtbaar.</p> <h3>Meerknopsmuis emulatie</h3> <p>Voor veel X11 programma's hebt u een 3-knops muis nodig. Met een 1-knops muis kunt u een 3-knops muis nabootsen door een toets in te drukken terwijl u klikt met de muis. Het instellen hiervan kan bij Voorkeuren, "Meerknopsmuis emulatie" in "Algemeen". Emulatie is standaard ingeschakeld: ingedrukt houden van de "command" toets terwijl u klikt emuleert knop 2, ingedrukt houden van "option" emuleert knop 3. Deze toetsen kunt u dus wijzigen in de Voorkeuren. Let op: als u xmodmap gebruikt om de indeling van het toetsenbord te wijzigen, moet u toch de oorspronkelijke toetsen op het toetsenbord gebruiken voor deze functie.</p> <h2><a NAME="path">Instellen van het Path</a></h2> <p>Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory <code>/usr/X11R6/bin</code>, die dus aan uw path moet worden toegevoegd. XDarwin doet dit automatisch voor u en kan extra directories toevoegen waarin u commando's hebt ge&iuml;nstalleerd.</p> <p>Ervaren gebruikers zullen het path al correct hebben ingesteld in de configuratiebestanden voor hun shell. In dat geval kunt u XDarwin via de Voorkeuren vertellen het path niet te wijzigen. XDarwin start de eerste X11 clients binnen de standaard login shell van de gebruiker (bij de Voorkeuren kunt u een afwijkende shell opgeven). Het instellen van het path is afhankelijk van de shell. Zie hiervoor de man pages voor de shell.</p> <p>Het kan handig zijn de man pages voor XFree86 toe te voegen aan de lijst waarin gezocht wordt als u documentatie opvraagt. De manualpages voor X11 staan in <code>/usr/X11R6/man</code> en de <code>MANPATH</code> environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.</p> <h2><a NAME="prefs">Voorkeursinstellingen</a></h2> <p>Een aantal instellingen kan worden gewijzigd door "Voorkeuren..." te kiezen in het "XDarwin" menu. Wijzigingen van de instellingen genoemd onder "Start" gaan pas in als u XDarwin opnieuw hebt gestart. Een wijziging van de overige instellingen is direct effectief. Hier onder vindt u de verschillende mogelijkheden beschreven:</p> <h3>Algemeen</h3> <ul> <li><b>Gebruik systeempiep voor X11:</b> Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).</li> <li><b>Wijzigen muis-versnelling door X11 mogelijk:</b> In een standaard X window systeem kan de window manager de muis-versnelling aanpassen. Dit kan verwarrend zijn omdat de snelheid onder X11 dan verschillend kan zijn van de snelheid die u in Mac OS X bij Systeemvoorkeuren hebt ingesteld. Om verwarring te voorkomen is de standaardinstelling dat X11 de versnelling niet kan wijzigen.</li> <li><b>Meerknopsmuis emulatie:</b> Dit is hierboven beschreven bij <a HREF="#usage">Gebruik</a>. Als emulatie is ingeschakeld moet u de gekozen toetsen ingedrukt houden terwijl u met de muis klikt om de tweede en derde muisknop na te bootsen.</li> </ul> <h3>Start</h3> <ul> <li><b>Standaard modus:</b> Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij <a HREF="#usage">Gebruik</a>). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.</li> <li><b>Kies scherm-modus tijdens start:</b> Dit is standaard ingeschakeld zodat u tijdens het starten van XDarwin kunt kiezen tussen schermvullend en rootless scherm-modus. Als u dit uitschakelt start XDarwin in de standaard modus zonder u iets te vragen.</li> <li><b>X11 scherm nummer:</b> Met X11 kunnen meerdere schermen worden aangestuurd door verschillende X servers op dezelfde computer. Als u meerdere X servers tegelijk wilt gebruiken stelt u hier het scherm nummer in dat door XDarwin wordt gebruikt.</li> <li><b>Xinerama multi-monitor ondersteuning mogelijk:</b> XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van &eacute;&eacute;n groot rechthoekig scherm. U kunt Xinerama hier uitschakelen, maar XDarwin werkt op dit moment zonder Xinerama niet goed met meerdere monitoren. Als u maar 1 monitor gebruikt is deze instelling automatisch uitgeschakeld.</li> <li><b>Toetsenbordindeling-bestand:</b> Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory <code>/System/Library/Keyboards</code>.</li> <li><b>Bij starten eerste X11 clients:</b> Als XDarwin start, wordt <code>xinit</code> uitgevoerd om de X window manager en andere X clients te starten (zie "<code>man xinit</code>"). Voordat XDarwin <code>xinit</code> uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen <code>/usr/X11R6/bin</code> toegevoegd. U kunt meerdere directories opgeven, gescheiden door een dubbelepunt. X clients worden gestart met de standaard login shell van de gebruiker met gebruik van de configuratiebestanden voor die shell. U kunt een afwijkende shell opgeven.</li> </ul> <h3>Schermvullend</h3> <ul> <li><b>Toetscombinatie knop:</b> Klik op deze knop om de toetscombinatie te wijzigen waarmee u tussen de Mac OS X desktop en X11 schakelt. Als toetscombinatie kunt u elke combinatie gebruiken van de shift, control, command en option toetsen samen met &eacute;&eacute;n normale toets.</li> <li><b>Klikken op icoon in Dock schakelt naar X11:</b> Hiermee is een klik op de XDarwin icoon in de Dock voldoende om naar X11 te schakelen. In sommige versies van Mac OS X verdwijnt soms de cursor als u deze mogelijkheid gebruikt en daarna terugkeert naar de Mac OS X desktop.</li> <li><b>Toon help bij schermvullend starten:</b> Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.</li> <li><b>Kleurdiepte:</b> In de schermvullende modus kan X11 een andere kleurdiepte gebruiken dan Aqua (en de Mac OS X desktop). Als u "Huidig" kiest, neemt XDarwin bij het starten de kleurdiepte over van Aqua. U kunt ook kiezen voor 8, 15 of 24 bits.</li> </ul> <h2><a NAME="license">Licentie</a></h2> The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86 License page</A>. <H3><A NAME="3"></A>X Consortium License</H3> <p>Copyright (C) 1996 X Consortium</p> <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p> <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.</p> <p>Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium.</p> <p>X Window System is a trademark of X Consortium, Inc.</p> </body> </html> \ No newline at end of file
diff --git a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
index 99211244e..0e5700ead 100644
--- a/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
+++ b/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
@@ -1,5 +1,5 @@
/* English versions of the Info.plist keys; used by most localizations. */
/* Most of these are set in the target application settings. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */
+/* $XFree86$ */
NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__;
diff --git a/hw/darwin/bundle/English.lproj/Localizable.strings b/hw/darwin/bundle/English.lproj/Localizable.strings
index 241d1585b..9ca7d4b36 100644
--- a/hw/darwin/bundle/English.lproj/Localizable.strings
+++ b/hw/darwin/bundle/English.lproj/Localizable.strings
@@ -1,5 +1,5 @@
/* English localized versions of strings used by the Mac OS X front end. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */
+/* $XFree86$ */
/* Title of alert panel */
"Quit X server?" = "Quit X server?";
diff --git a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
index fc11e26d3..e3d43ff7d 100644
--- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
index 0fdfb01fb..b1f9ae6e6 100644
--- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/20 06:42:20 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
index 6b1b91f5c..e341fde91 100644
--- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp,v 1.1 2001/11/03 00:25:34 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
index 2065d43d4..90731d31a 100644
--- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.5 2002/05/04 01:25:40 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
index 37502eac6..cf60af84c 100644
--- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp,v 1.1 2002/01/25 06:46:46 torrey Exp $ --><html><body>
+<!-- $XFree86$ --><html><body>
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
index 3e0710a2c..6d472ad6f 100644
--- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/12/30 03:52:27 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
index ee099d1a0..8fdb9eeec 100644
--- a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/07 22:43:27 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
index 4c83fe278..e3d43ff7d 100644
--- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
+++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
@@ -1,4 +1,4 @@
-<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp,v 1.1 2001/12/04 03:36:39 torrey Exp $ -->
+<!-- $XFree86$ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp
index b27ad46fe..37a1c77a5 100644
--- a/hw/darwin/bundle/startXClients.cpp
+++ b/hw/darwin/bundle/startXClients.cpp
@@ -3,7 +3,7 @@ XCOMM!/bin/sh
XCOMM This script is used by XDarwin to start X clients when XDarwin is
XCOMM launched from the Finder.
XCOMM
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $
+XCOMM $XFree86$
userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c
index bf0975769..5738df32b 100644
--- a/hw/darwin/darwin.c
+++ b/hw/darwin/darwin.c
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index 79fa00ffc..b2738c598 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -23,7 +23,7 @@
* 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: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86$ */
#ifndef _DARWIN_H
#define _DARWIN_H
diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h
index 68a7ad16f..3825dc722 100644
--- a/hw/darwin/darwinClut8.h
+++ b/hw/darwin/darwinClut8.h
@@ -1,7 +1,7 @@
/*
* Darwin default 8-bit Colormap for StaticColor
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */
+/* $XFree86$ */
#ifndef _DARWIN_CLUT8_
#define _DARWIN_CLUT8_
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index ba1ec8fc2..d376624b9 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "X.h"
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 57bf5fa3d..920f065a1 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -37,7 +37,7 @@
//
//=============================================================================
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86$ */
/*
===========================================================================
diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h
index c71888990..6d579046f 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/darwin/darwinKeyboard.h
@@ -23,7 +23,7 @@
* 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: xc/programs/Xserver/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86$ */
#ifndef DARWIN_KEYBOARD_H
#define DARWIN_KEYBOARD_H 1
diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c
index a7f5f18ee..5e6b64561 100644
--- a/hw/darwin/iokit/xfIOKit.c
+++ b/hw/darwin/iokit/xfIOKit.c
@@ -33,7 +33,7 @@
* 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: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h
index 413dfd7e8..924359030 100644
--- a/hw/darwin/iokit/xfIOKit.h
+++ b/hw/darwin/iokit/xfIOKit.h
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86$ */
#ifndef _XFIOKIT_H
#define _XFIOKIT_H
diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c
index f3c80145f..7c1526c77 100644
--- a/hw/darwin/iokit/xfIOKitCursor.c
+++ b/hw/darwin/iokit/xfIOKitCursor.c
@@ -57,7 +57,7 @@
* 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: xc/programs/Xserver/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86$ */
#include "scrnintstr.h"
#include "cursorstr.h"
diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c
index 9d25c69fe..02e4c683e 100644
--- a/hw/darwin/iokit/xfIOKitStartup.c
+++ b/hw/darwin/iokit/xfIOKitStartup.c
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */
+/* $XFree86$ */
#include "darwin.h"
#include "darwinKeyboard.h"
diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h
index 22a2f1441..331f3598d 100644
--- a/hw/darwin/quartz/Preferences.h
+++ b/hw/darwin/quartz/Preferences.h
@@ -25,7 +25,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86$ */
#import <Cocoa/Cocoa.h>
diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m
index 4120b6360..db264d338 100644
--- a/hw/darwin/quartz/Preferences.m
+++ b/hw/darwin/quartz/Preferences.m
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */
+/* $XFree86$ */
#import "quartzCommon.h"
diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h
index 3d3e96dab..05de22633 100644
--- a/hw/darwin/quartz/XApplication.h
+++ b/hw/darwin/quartz/XApplication.h
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86$ */
#import <Cocoa/Cocoa.h>
diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m
index 9b81bbee0..091a9590f 100644
--- a/hw/darwin/quartz/XApplication.m
+++ b/hw/darwin/quartz/XApplication.m
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */
+/* $XFree86$ */
#import "XApplication.h"
diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c
index 7b2c89f38..91d8ec4a2 100644
--- a/hw/darwin/quartz/XDarwinStartup.c
+++ b/hw/darwin/quartz/XDarwinStartup.c
@@ -38,7 +38,7 @@
* dealings in this Software without prior written authorization from
* Torrey T. Lyons.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */
+/* $XFree86$ */
#include <unistd.h>
#include <stdio.h>
diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man
index 312f4b88b..470bd392c 100644
--- a/hw/darwin/quartz/XDarwinStartup.man
+++ b/hw/darwin/quartz/XDarwinStartup.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $
+.\" $XFree86$
.TH XDarwinStartup 1
.SH NAME
XDarwinStartup - Startup program for the XDarwin X window server
diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h
index 01b8ec55e..d147b4ee2 100644
--- a/hw/darwin/quartz/XServer.h
+++ b/hw/darwin/quartz/XServer.h
@@ -29,7 +29,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */
+/* $XFree86$ */
#define BOOL xBOOL
#include "Xproto.h"
diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m
index 56e672204..a3d4b3518 100644
--- a/hw/darwin/quartz/XServer.m
+++ b/hw/darwin/quartz/XServer.m
@@ -34,7 +34,7 @@
* sale, use or other dealings in this Software without prior written
* authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index d3e302727..f4b68740d 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved.
diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h
index 650173941..eab5584e8 100644
--- a/hw/darwin/quartz/applewmExt.h
+++ b/hw/darwin/quartz/applewmExt.h
@@ -27,7 +27,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */
+/* $XFree86$ */
#ifndef _APPLEWMEXT_H_
#define _APPLEWMEXT_H_
diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h
index 666061dc1..44094ab5b 100644
--- a/hw/darwin/quartz/cr/XView.h
+++ b/hw/darwin/quartz/cr/XView.h
@@ -25,7 +25,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */
+/* $XFree86$ */
#import <Cocoa/Cocoa.h>
diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m
index 2bf689ede..5348ad9c6 100644
--- a/hw/darwin/quartz/cr/XView.m
+++ b/hw/darwin/quartz/cr/XView.m
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */
+/* $XFree86$ */
#import "XView.h"
diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h
index 74752f768..94133e4af 100644
--- a/hw/darwin/quartz/cr/cr.h
+++ b/hw/darwin/quartz/cr/cr.h
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */
+/* $XFree86$ */
#ifndef _CR_H
#define _CR_H
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
index 66e832b66..23e7f5020 100644
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ b/hw/darwin/quartz/cr/crAppleWM.m
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "cr.h"
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
index b308dec74..b75041354 100644
--- a/hw/darwin/quartz/cr/crFrame.m
+++ b/hw/darwin/quartz/cr/crFrame.m
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "cr.h"
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
index ab27e8eb8..9dad8d4e4 100644
--- a/hw/darwin/quartz/cr/crScreen.m
+++ b/hw/darwin/quartz/cr/crScreen.m
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.6 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "cr.h"
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index 470528943..14be893b1 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -25,7 +25,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "darwin.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index 72ad5ed8e..90521d5e0 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "quartzCursor.h"
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h
index d822c3e86..85f150de0 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.h
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.h
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86$ */
#ifndef QUARTZCURSOR_H
#define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c
index 420830965..f272f259e 100644
--- a/hw/darwin/quartz/keysym2ucs.c
+++ b/hw/darwin/quartz/keysym2ucs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $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 1d9183448..05d8e2d89 100644
--- a/hw/darwin/quartz/keysym2ucs.h
+++ b/hw/darwin/quartz/keysym2ucs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $
+/* $XFree86$
*
* This module converts keysym values into the corresponding ISO 10646
* (UCS, Unicode) values.
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index 2dd7c3ae5..35667ff23 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -32,7 +32,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86$ */
#include "pseudoramiX.h"
diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h
index 23738cfb3..3b5986912 100644
--- a/hw/darwin/quartz/pseudoramiX.h
+++ b/hw/darwin/quartz/pseudoramiX.h
@@ -1,7 +1,7 @@
/*
* Minimal implementation of PanoramiX/Xinerama
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86$ */
extern int noPseudoramiXExtension;
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index 91ca9fa28..838574567 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "quartz.h"
diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h
index 2cec61d66..272cc380d 100644
--- a/hw/darwin/quartz/quartz.h
+++ b/hw/darwin/quartz/quartz.h
@@ -30,7 +30,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86$ */
#ifndef _QUARTZ_H
#define _QUARTZ_H
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c
index a3e6af127..f7ebb8748 100644
--- a/hw/darwin/quartz/quartzAudio.c
+++ b/hw/darwin/quartz/quartzAudio.c
@@ -35,7 +35,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "quartzAudio.h"
diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h
index 1d213e36a..1a63a7f9d 100644
--- a/hw/darwin/quartz/quartzAudio.h
+++ b/hw/darwin/quartz/quartzAudio.h
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86$ */
#ifndef _QUARTZAUDIO_H
#define _QUARTZAUDIO_H
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m
index bba71c041..b0b32aa1c 100644
--- a/hw/darwin/quartz/quartzCocoa.m
+++ b/hw/darwin/quartz/quartzCocoa.m
@@ -33,7 +33,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h
index e3ae4b850..61534e528 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/darwin/quartz/quartzCommon.h
@@ -31,7 +31,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */
+/* $XFree86$ */
#ifndef _QUARTZCOMMON_H
#define _QUARTZCOMMON_H
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index 8abce2318..90521d5e0 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "quartzCursor.h"
diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h
index 9710d4be2..e9f7524d7 100644
--- a/hw/darwin/quartz/quartzCursor.h
+++ b/hw/darwin/quartz/quartzCursor.h
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86$ */
#ifndef QUARTZCURSOR_H
#define QUARTZCURSOR_H
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index eab86e27e..3d4fdce00 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -32,7 +32,7 @@
promote the sale, use or other dealings in this Software without
prior written authorization.
*/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c
index 658832aa1..e882d5028 100644
--- a/hw/darwin/quartz/quartzPasteboard.c
+++ b/hw/darwin/quartz/quartzPasteboard.c
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86$ */
#include "quartzPasteboard.h"
diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h
index fef375493..30fa381cf 100644
--- a/hw/darwin/quartz/quartzPasteboard.h
+++ b/hw/darwin/quartz/quartzPasteboard.h
@@ -29,7 +29,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
+/* $XFree86$ */
#ifndef _QUARTZPASTEBOARD_H
#define _QUARTZPASTEBOARD_H
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c
index bb7c7d214..78ca43bdc 100644
--- a/hw/darwin/quartz/quartzStartup.c
+++ b/hw/darwin/quartz/quartzStartup.c
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */
+/* $XFree86$ */
#include <fcntl.h>
#include <unistd.h>
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h
index 8985f7b11..be425ae8d 100644
--- a/hw/darwin/quartz/xpr/Xplugin.h
+++ b/hw/darwin/quartz/xpr/Xplugin.h
@@ -30,7 +30,7 @@
Note that these interfaces are provided solely for the use of the
X11 server. Any other uses are unsupported and strongly discouraged. */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */
+/* $XFree86$ */
#ifndef XPLUGIN_H
#define XPLUGIN_H 1
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 3062d964a..40398b712 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index aa595af85..483683fe3 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h
index 350f61b56..c58aa8ca7 100644
--- a/hw/darwin/quartz/xpr/dri.h
+++ b/hw/darwin/quartz/xpr/dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h
index 1a2949b18..6c71a68ef 100644
--- a/hw/darwin/quartz/xpr/dristruct.h
+++ b/hw/darwin/quartz/xpr/dristruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
/**************************************************************************
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 ad36204c5..8a759bd7c 100644
--- a/hw/darwin/quartz/xpr/x-hash.c
+++ b/hw/darwin/quartz/xpr/x-hash.c
@@ -27,7 +27,7 @@
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: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#include "x-hash.h"
#include "x-list.h"
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h
index 2abb08cd7..aa33b0024 100644
--- a/hw/darwin/quartz/xpr/x-hash.h
+++ b/hw/darwin/quartz/xpr/x-hash.h
@@ -27,7 +27,7 @@
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: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#ifndef X_HASH_H
#define X_HASH_H 1
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
index 3414e1543..a3dda28c5 100644
--- a/hw/darwin/quartz/xpr/x-hook.c
+++ b/hw/darwin/quartz/xpr/x-hook.c
@@ -27,7 +27,7 @@
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: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#include "x-hook.h"
#include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h
index 14e8ca1f5..a1d23e4a5 100644
--- a/hw/darwin/quartz/xpr/x-hook.h
+++ b/hw/darwin/quartz/xpr/x-hook.h
@@ -27,7 +27,7 @@
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: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */
+/* $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 859a5163d..5a2c13afa 100644
--- a/hw/darwin/quartz/xpr/x-list.c
+++ b/hw/darwin/quartz/xpr/x-list.c
@@ -27,7 +27,7 @@
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: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#include "x-list.h"
#include <stdlib.h>
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h
index a65cfcb7c..3c605e81a 100644
--- a/hw/darwin/quartz/xpr/x-list.h
+++ b/hw/darwin/quartz/xpr/x-list.h
@@ -27,7 +27,7 @@
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: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#ifndef X_LIST_H
#define X_LIST_H 1
diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h
index b3091f8e1..cf7b5f735 100644
--- a/hw/darwin/quartz/xpr/xpr.h
+++ b/hw/darwin/quartz/xpr/xpr.h
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86$ */
#ifndef XPR_H
#define XPR_H
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
index eca0de334..a96af5c20 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/darwin/quartz/xpr/xprAppleWM.c
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86$ */
#include "xpr.h"
#include "applewmExt.h"
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index a3dea69e2..c70af657f 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -30,7 +30,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "xpr.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 552153852..c5c5f7742 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86$ */
#include "xpr.h"
#include "rootlessCommon.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
index 771b7c9f4..61e892d27 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/darwin/quartz/xpr/xprScreen.c
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.9 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86$ */
#include "quartzCommon.h"
#include "quartz.h"
diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt
index 94d61b1f0..20ce9f14f 100644
--- a/hw/darwin/utils/README.txt
+++ b/hw/darwin/utils/README.txt
@@ -108,4 +108,4 @@ of the NeXT .keymapping file.
-$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $
+$XFree86$
diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
index a264cbc10..8eb0a6fda 100644
--- a/hw/darwin/utils/dumpkeymap.c
+++ b/hw/darwin/utils/dumpkeymap.c
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $
+// $XFree86$
//=============================================================================
//
// Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man
index 2ad6d54d2..12983bada 100644
--- a/hw/darwin/utils/dumpkeymap.man
+++ b/hw/darwin/utils/dumpkeymap.man
@@ -30,7 +30,7 @@
//
//=============================================================================
//
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $
+// $XFree86$
//
..
.ig
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 345526d19..07be3207c 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.10 2003/11/16 03:16:59 dawes Exp $ */
+/* $XFree86$ */
#include "X11/X.h"
#define NEED_EVENTS
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 25f426232..6ab003657 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.26 2003/11/16 03:16:59 dawes Exp $ */
+/* $XFree86$ */
#if defined(WIN32)
#include <X11/Xwinsock.h>
diff --git a/hw/vfb/Xvfb.man.pre b/hw/vfb/Xvfb.man.pre
index 6bd24e9b4..4e256cb8b 100644
--- a/hw/vfb/Xvfb.man.pre
+++ b/hw/vfb/Xvfb.man.pre
@@ -23,7 +23,7 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.10 2003/11/23 05:40:36 dawes Exp $
+.\" $XFree86$
.\"
.TH XVFB 1 __xorgversion__
.SH NAME
diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes
index f7dc01216..ad9195345 100644
--- a/hw/xfree86/common/extramodes
+++ b/hw/xfree86/common/extramodes
@@ -1,7 +1,7 @@
//
// Extra modes to include as default modes in the X server.
//
-// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $
+// $XFree86$
//
# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
diff --git a/hw/xfree86/common/modeline2c.pl b/hw/xfree86/common/modeline2c.pl
index e31fe28e1..00faf3deb 100644
--- a/hw/xfree86/common/modeline2c.pl
+++ b/hw/xfree86/common/modeline2c.pl
@@ -34,7 +34,7 @@
# the sale, use or other dealings in this Software without prior written
# authorization from the copyright holder(s) and author(s).
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $
+# $XFree86$
#my %flagshash;
$flagshash{""} = "0";
diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes
index d2df5931a..f950590eb 100644
--- a/hw/xfree86/common/vesamodes
+++ b/hw/xfree86/common/vesamodes
@@ -3,7 +3,7 @@
// "VESA and Industry Standards and Guide for Computer Display Monitor
// Timing", version 1.0, revision 0.8, adopted September 17, 1998.
//
-// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $
+// $XFree86$
# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 8f6dd2803..feb4b67c3 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 3dde4ba7d..26278981c 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
*
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 5e4bc29b6..ce745dc1c 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright (c) 1998-2002 by The XFree86 Project, Inc.
*
diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c
index 7257b204b..1d6d332ec 100644
--- a/hw/xfree86/common/xf86DefModes.c
+++ b/hw/xfree86/common/xf86DefModes.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */
+/* $XFree86$ */
/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at
* modeline2c.pl */
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index c6dee3731..94cca48a3 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.41 2003/08/24 17:36:52 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -236,7 +236,7 @@ Bool xf86VidModeAllowNonLocal = FALSE;
Bool xf86MiscModInDevDisabled = FALSE;
Bool xf86MiscModInDevAllowNonLocal = FALSE;
#endif
-PropertyPtr *xf86RegisteredPropertiesTable = NULL;
+RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
Bool xf86inSuspend = FALSE;
#ifdef DLOPEN_HACK
diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c
index fbbafd8af..5780bb36b 100644
--- a/hw/xfree86/common/xf86KbdMach.c
+++ b/hw/xfree86/common/xf86KbdMach.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */
+/* $XFree86$ */
/*
*****************************************************************************
* HISTORY
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 546c909ff..fcd995b6c 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
+ * $XFree86$
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 87042cb14..de012fd17 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -20,7 +20,7 @@
* 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.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */
+/* $XFree86$ */
#include <ctype.h>
#include <stdio.h>
diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
index 0816c63a1..21c719298 100644
--- a/hw/xfree86/common/xf86sbusBus.h
+++ b/hw/xfree86/common/xf86sbusBus.h
@@ -20,7 +20,7 @@
* 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.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */
+/* $XFree86$ */
#ifndef _XF86_SBUSBUS_H
#define _XF86_SBUSBUS_H
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 90289057b..d0fa316f0 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -28,7 +28,7 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c
index facc27842..3cf154e66 100644
--- a/hw/xfree86/common/xisb.c
+++ b/hw/xfree86/common/xisb.c
@@ -24,7 +24,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */
+/* $XFree86$ */
/*
X Input Serial Buffer routines for use in any XInput driver that accesses
diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h
index 7b5e26a23..39ae2ee11 100644
--- a/hw/xfree86/common/xisb.h
+++ b/hw/xfree86/common/xisb.h
@@ -24,7 +24,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */
+/* $XFree86$ */
#ifndef _xisb_H_
#define _xisb_H_
diff --git a/hw/xfree86/ddc/DDC.HOWTO b/hw/xfree86/ddc/DDC.HOWTO
index 2f2c95b7f..0fefefc79 100644
--- a/hw/xfree86/ddc/DDC.HOWTO
+++ b/hw/xfree86/ddc/DDC.HOWTO
@@ -94,4 +94,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.3 1999/09/25 14:37:16 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c
index 666dfc632..769aae29d 100644
--- a/hw/xfree86/ddc/ddcProperty.c
+++ b/hw/xfree86/ddc/ddcProperty.c
@@ -3,7 +3,7 @@
*
* Copyright 1999 by Andrew C Aitchison <A.C.Aitchison@dpmms.cam.ac.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c
index a61940cfa..5375fe39e 100644
--- a/hw/xfree86/ddc/edid.c
+++ b/hw/xfree86/ddc/edid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */
+/* $XFree86$ */
/* edid.c: retrieve EDID record from raw DDC1 data stream: data
* is contained in an array of unsigned int each unsigned int
diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 7a2f30cb4..0998f1ef1 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */
+/* $XFree86$ */
/* edid.h: defines to parse an EDID block
*
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index c0092aed9..3c5f0e3b5 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */
+/* $XFree86$ */
/* interpret_edid.c: interpret a primary EDID block
*
diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c
index acd931e70..75bdd2e56 100644
--- a/hw/xfree86/ddc/interpret_vdif.c
+++ b/hw/xfree86/ddc/interpret_vdif.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */
+/* $XFree86$ */
#include "Xarch.h"
#include "xf86DDC.h"
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 064533800..b81a2e976 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */
+/* $XFree86$ */
/* print_edid.c: print out all information retrieved from display device
*
diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c
index fbb540e1d..671a2f7d7 100644
--- a/hw/xfree86/ddc/print_vdif.c
+++ b/hw/xfree86/ddc/print_vdif.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
+/* $XFree86$ */
#include "vdif.h"
#include "misc.h"
diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h
index 8d358613e..c12b72953 100644
--- a/hw/xfree86/ddc/vdif.h
+++ b/hw/xfree86/ddc/vdif.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
+/* $XFree86$ */
#ifndef _VDIF_H
#define _VDIF_H
diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index 496f3573f..9825e1ffe 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */
+/* $XFree86$ */
/* xf86DDC.c
*
diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h
index b4252ef6b..0602438d5 100644
--- a/hw/xfree86/ddc/xf86DDC.h
+++ b/hw/xfree86/ddc/xf86DDC.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */
+/* $XFree86$ */
/* xf86DDC.h
*
diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c
index 9369db1f2..05720f751 100644
--- a/hw/xfree86/dixmods/GLcoremodule.c
+++ b/hw/xfree86/dixmods/GLcoremodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c
index f9dcc8477..519f93de8 100644
--- a/hw/xfree86/dixmods/dbemodule.c
+++ b/hw/xfree86/dixmods/dbemodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */
+/* $XFree86$ */
#include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h
index a0108053c..f2d991eaa 100644
--- a/hw/xfree86/dixmods/extmod/dgaproc.h
+++ b/hw/xfree86/dixmods/extmod/dgaproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.22 2003/07/16 01:38:29 dawes Exp $ */
+/* $XFree86$ */
#ifndef __DGAPROC_H
#define __DGAPROC_H
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index dc76cbf21..5aceb2707 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.17 2003/07/16 01:38:33 dawes Exp $ */
+/* $XFree86$ */
/*
*
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index cc717c31b..68aa7ab5b 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */
+/* $XFree86$ */
#ifndef INITARGS
#define INITARGS void
diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h
index 57a7872f0..69d53fd36 100644
--- a/hw/xfree86/dixmods/extmod/vidmodeproc.h
+++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.5 2001/05/06 00:51:19 mvojkovi Exp $ */
+/* $XFree86$ */
/* Prototypes for DGA functions that the DDX must provide */
diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c
index 973f54e23..5efe3f22b 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.22 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 2556743bb..b5ede289e 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -3,7 +3,7 @@
Written by Mark Vojkovich
*/
-/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.18 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h
index 831108399..a823e28f2 100644
--- a/hw/xfree86/dixmods/extmod/xf86dgaext.h
+++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86dgaext.h,v 1.1 2003/07/16 01:38:30 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XF86DGAEXT_H_
#define _XF86DGAEXT_H_
diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h
index 208260947..d1665e380 100644
--- a/hw/xfree86/dixmods/extmod/xf86miscproc.h
+++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.6 2003/04/03 16:15:47 dawes Exp $ */
+/* $XFree86$ */
/* Prototypes for Pointer/Keyboard functions that the DDX must provide */
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index f4751a1c7..34d7b6538 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.59 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c
index 4a9c461f6..8a9be7d3e 100644
--- a/hw/xfree86/dixmods/extmod/xvmod.c
+++ b/hw/xfree86/dixmods/extmod/xvmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h
index 2dcbd472a..6f11c204b 100644
--- a/hw/xfree86/dixmods/extmod/xvmodproc.h
+++ b/hw/xfree86/dixmods/extmod/xvmodproc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.3 2001/04/08 16:33:22 dawes Exp $ */
+/* $XFree86$ */
#include "xvmcext.h"
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index f449d55ec..cddebe7b4 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.12 2003/09/28 20:15:40 alanh Exp $ */
+/* $XFree86$ */
/*
* Authors:
diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c
index 60b6bcfa0..274e68b2e 100644
--- a/hw/xfree86/dixmods/laymodule.c
+++ b/hw/xfree86/dixmods/laymodule.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c
index acafc456d..d96c77d1f 100644
--- a/hw/xfree86/dixmods/recordmod.c
+++ b/hw/xfree86/dixmods/recordmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */
+/* $XFree86$ */
#include "xf86Module.h"
diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c
index 44aef65ce..d24f8a823 100644
--- a/hw/xfree86/dixmods/shmodule.c
+++ b/hw/xfree86/dixmods/shmodule.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shmodule.c,v 1.1 2000/09/03 05:07:24 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c
index 07283cdb7..65062108e 100644
--- a/hw/xfree86/dixmods/xf86XTrapModule.c
+++ b/hw/xfree86/dixmods/xf86XTrapModule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xf86XTrapModule.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */
+/* $XFree86$ */
/* This is the xf86 module code for the DEC_XTRAP extension.
*/
diff --git a/hw/xfree86/doc/README.DRI b/hw/xfree86/doc/README.DRI
index e663f2928..6610ab8b5 100644
--- a/hw/xfree86/doc/README.DRI
+++ b/hw/xfree86/doc/README.DRI
@@ -1254,4 +1254,4 @@ demo programs is available from http://dri.sourceforge.net/res.phtml
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.29 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.22 2003/07/15 02:28:28 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/README.fonts b/hw/xfree86/doc/README.fonts
index 2fe8dfaac..ce2f8ddde 100644
--- a/hw/xfree86/doc/README.fonts
+++ b/hw/xfree86/doc/README.fonts
@@ -1184,4 +1184,4 @@ for example RFC 373.
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.28 2003/12/20 19:47:28 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/README.rapidaccess b/hw/xfree86/doc/README.rapidaccess
index a78dfb9bc..d19eb81c6 100644
--- a/hw/xfree86/doc/README.rapidaccess
+++ b/hw/xfree86/doc/README.rapidaccess
@@ -45,4 +45,4 @@ Dennis Björklund <db@zigo.dhs.org>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rapidaccess,v 1.1 2001/05/18 23:35:32 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/changelogs/CHANGELOG b/hw/xfree86/doc/changelogs/CHANGELOG
index 1a8920321..b2ac469f9 100644
--- a/hw/xfree86/doc/changelogs/CHANGELOG
+++ b/hw/xfree86/doc/changelogs/CHANGELOG
@@ -18646,7 +18646,7 @@ XFree86 3.0a (28 April 1994)
XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3145 2004/02/16 01:01:45 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/changelogs/CHANGELOG.ND b/hw/xfree86/doc/changelogs/CHANGELOG.ND
index 3c9e1e1f6..36ff4aa6d 100644
--- a/hw/xfree86/doc/changelogs/CHANGELOG.ND
+++ b/hw/xfree86/doc/changelogs/CHANGELOG.ND
@@ -415,4 +415,4 @@ XFree86 3.9j (12 July 1997)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.3 1998/08/02 05:16:54 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/devel/Domain.note b/hw/xfree86/doc/devel/Domain.note
index 3db2aefae..ce0812b22 100644
--- a/hw/xfree86/doc/devel/Domain.note
+++ b/hw/xfree86/doc/devel/Domain.note
@@ -156,4 +156,4 @@ Most drivers currently used on ix86 need(ed) source code changes.
multi-domain architectures, and support for Mach64 variants as
non-primary heads is not yet available.
-$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/devel/README.DRIcomp b/hw/xfree86/doc/devel/README.DRIcomp
index 0f1bd1b69..c20c173d1 100644
--- a/hw/xfree86/doc/devel/README.DRIcomp
+++ b/hw/xfree86/doc/devel/README.DRIcomp
@@ -554,4 +554,4 @@ trouble shooting and how to use the DRI-enabled X server for 3D applications.
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.20 dawes Exp $
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.17 2003/07/15 02:28:28 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry
index 9c4111348..a5aed88b6 100644
--- a/hw/xfree86/doc/devel/Registry
+++ b/hw/xfree86/doc/devel/Registry
@@ -407,4 +407,4 @@ and underscores removed.
-$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.19 2003/02/20 04:05:12 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml
index 864b5c249..e154b2c04 100644
--- a/hw/xfree86/doc/sgml/DESIGN.sgml
+++ b/hw/xfree86/doc/sgml/DESIGN.sgml
@@ -36,7 +36,7 @@
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.54 2003/12/19 20:38:57 dawes Exp $
+$XFree86$
</ident>
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 551a3c2a8..527ed0c1b 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.40 2004/01/30 14:31:58 alanh Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 80602d3dd..7b19daa1c 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.19 2002/10/30 12:52:03 alanh Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c
index bb7a89ee0..12e1a0db9 100644
--- a/hw/xfree86/dri/drimodule.c
+++ b/hw/xfree86/dri/drimodule.c
@@ -24,7 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
**************************************************************************/
-/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.6 2001/12/10 19:07:19 dawes Exp $ */
+/* $XFree86$ */
/*
* Authors:
diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h
index e733ac210..f3c8a86a5 100644
--- a/hw/xfree86/dri/dristruct.h
+++ b/hw/xfree86/dri/dristruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.13 2002/11/20 18:10:24 dawes Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h
index fcb4b59bd..af7d06760 100644
--- a/hw/xfree86/dri/sarea.h
+++ b/hw/xfree86/dri/sarea.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */
+/* $XFree86$ */
/**
* \file sarea.h
* SAREA definitions.
@@ -34,7 +34,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */
+/* $XFree86$ */
#ifndef _SAREA_H_
#define _SAREA_H_
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 3df0cca59..d77c23609 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.13 2003/09/24 02:43:12 dawes Exp $ */
+/* $XFree86$ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/hw/xfree86/dummylib/README b/hw/xfree86/dummylib/README
index 8e5b539a6..4e270307a 100644
--- a/hw/xfree86/dummylib/README
+++ b/hw/xfree86/dummylib/README
@@ -4,4 +4,4 @@ There is one symbol per source/object so that each can be overriden
individually by whatever uses this library.
-$XFree86: xc/programs/Xserver/hw/xfree86/dummylib/README,v 1.1 2000/02/13 03:06:38 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h
index d8a0d285a..af61835a8 100644
--- a/hw/xfree86/dummylib/dummylib.h
+++ b/hw/xfree86/dummylib/dummylib.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#ifndef _DUMMY_LIB_H
#define _DUMMY_LIB_H
diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c
index 3c482b480..ec437d8df 100644
--- a/hw/xfree86/dummylib/fatalerror.c
+++ b/hw/xfree86/dummylib/fatalerror.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/fatalerror.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c
index a16126842..47c39fb7e 100644
--- a/hw/xfree86/dummylib/getvalidbios.c
+++ b/hw/xfree86/dummylib/getvalidbios.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.3 2001/05/15 10:19:41 eich Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c
index 75634d7f3..dace68cb6 100644
--- a/hw/xfree86/dummylib/logvwrite.c
+++ b/hw/xfree86/dummylib/logvwrite.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/logvwrite.c,v 1.1 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c
index 4259f678e..d6e5c65a1 100644
--- a/hw/xfree86/dummylib/pcitestmulti.c
+++ b/hw/xfree86/dummylib/pcitestmulti.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/pcitestmulti.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c
index e36a590e7..30bc93e71 100644
--- a/hw/xfree86/dummylib/verrorf.c
+++ b/hw/xfree86/dummylib/verrorf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorf.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c
index 63d3ff8c7..60e7c71b7 100644
--- a/hw/xfree86/dummylib/xalloc.c
+++ b/hw/xfree86/dummylib/xalloc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.2 2002/11/09 09:00:13 herrb Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c
index ea24fc1dc..fd0990214 100644
--- a/hw/xfree86/dummylib/xf86addrestolist.c
+++ b/hw/xfree86/dummylib/xf86addrestolist.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.3 2002/12/24 15:50:43 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c
index 1f61eda4d..f0cb2e127 100644
--- a/hw/xfree86/dummylib/xf86allocscripi.c
+++ b/hw/xfree86/dummylib/xf86allocscripi.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86allocscripi.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c
index 5780d9c13..889e9ded7 100644
--- a/hw/xfree86/dummylib/xf86drvmsg.c
+++ b/hw/xfree86/dummylib/xf86drvmsg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c
index b7c0ddb53..7ce6c13b2 100644
--- a/hw/xfree86/dummylib/xf86drvmsgverb.c
+++ b/hw/xfree86/dummylib/xf86drvmsgverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c
index 122f46d43..28b936d73 100644
--- a/hw/xfree86/dummylib/xf86errorf.c
+++ b/hw/xfree86/dummylib/xf86errorf.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c
index 61c3e02a2..06fb027a8 100644
--- a/hw/xfree86/dummylib/xf86errorfverb.c
+++ b/hw/xfree86/dummylib/xf86errorfverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c
index 51b785a73..50701741f 100644
--- a/hw/xfree86/dummylib/xf86getpagesize.c
+++ b/hw/xfree86/dummylib/xf86getpagesize.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getpagesize.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c
index a4255698f..410d7b645 100644
--- a/hw/xfree86/dummylib/xf86getverb.c
+++ b/hw/xfree86/dummylib/xf86getverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c
index d7b95b430..d488d3615 100644
--- a/hw/xfree86/dummylib/xf86info.c
+++ b/hw/xfree86/dummylib/xf86info.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86info.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c
index 2d36bea97..0d99bb515 100644
--- a/hw/xfree86/dummylib/xf86msg.c
+++ b/hw/xfree86/dummylib/xf86msg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c
index f460b6b9f..10e8f8d6d 100644
--- a/hw/xfree86/dummylib/xf86msgverb.c
+++ b/hw/xfree86/dummylib/xf86msgverb.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c
index dd00635b0..1e5137947 100644
--- a/hw/xfree86/dummylib/xf86opt.c
+++ b/hw/xfree86/dummylib/xf86opt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.2 2001/05/04 19:05:50 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c
index 031b6e55a..8d9591442 100644
--- a/hw/xfree86/dummylib/xf86screens.c
+++ b/hw/xfree86/dummylib/xf86screens.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86screens.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c
index 8339c658b..2f959a95c 100644
--- a/hw/xfree86/dummylib/xf86servisinit.c
+++ b/hw/xfree86/dummylib/xf86servisinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86servisinit.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c
index 877bd6fd7..1f4614ba3 100644
--- a/hw/xfree86/dummylib/xf86verbose.c
+++ b/hw/xfree86/dummylib/xf86verbose.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86verbose.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 752cdb044..beac353d5 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */
+/* $XFree86$ */
/* all driver need this */
#include "xf86.h"
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index cfc47f905..e33374fda 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.12 2003/10/30 17:37:16 tsi Exp $ */
+/* $XFree86$ */
#ifndef _FBDEVHW_H_
#define _FBDEVHW_H_
diff --git a/hw/xfree86/fbdevhw/fbdevhw.man.pre b/hw/xfree86/fbdevhw/fbdevhw.man.pre
index dadc1f9a3..1a15b7aa6 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.man.pre
+++ b/hw/xfree86/fbdevhw/fbdevhw.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.2 2001/01/27 18:20:56 dawes Exp $
+.\" $XFree86$
.TH FBDEVHW __drivermansuffix__ __vendorversion__
.SH NAME
fbdevhw \- os-specific submodule for framebuffer device access
diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c
index b262be90f..c147dafa9 100644
--- a/hw/xfree86/fbdevhw/fbdevhwstub.c
+++ b/hw/xfree86/fbdevhw/fbdevhwstub.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86cmap.h"
diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h
index d651e5129..442987cc9 100644
--- a/hw/xfree86/fbdevhw/fbpriv.h
+++ b/hw/xfree86/fbdevhw/fbpriv.h
@@ -2,7 +2,7 @@
* copyed from from linux kernel 2.2.4
* removed internal stuff (#ifdef __KERNEL__)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.3 2000/08/11 17:27:14 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LINUX_FB_H
#define _LINUX_FB_H
diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre
index fcf1a6161..79db0b100 100644
--- a/hw/xfree86/getconfig/cfg.man.pre
+++ b/hw/xfree86/getconfig/cfg.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
+.\" $XFree86$
.TH getconfig __filemansuffix__ __vendorversion__
.SH NAME
getconfig - meta configuration files for getconfig(1)
diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample
index acf262d1a..7a3586a75 100644
--- a/hw/xfree86/getconfig/cfg.sample
+++ b/hw/xfree86/getconfig/cfg.sample
@@ -1,5 +1,5 @@
# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $
-# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/11/12 04:52:15 dawes Exp $
+# $XFree86$
# Some sample XFree86 getconfig rules file.
diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre
index 16c472fc5..6b43047c3 100644
--- a/hw/xfree86/getconfig/getconfig.man.pre
+++ b/hw/xfree86/getconfig/getconfig.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
+.\" $XFree86$
.TH getconfig 1 __vendorversion__
.SH NAME
getconfig - get configuration information for the XFree86 server
diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index a7f5adf1a..dda9b6328 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -6,7 +6,7 @@
* (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */
+/* $XFree86$ */
#if 1
#include "misc.h"
diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h
index e7423155a..53c1bff88 100644
--- a/hw/xfree86/i2c/xf86i2c.h
+++ b/hw/xfree86/i2c/xf86i2c.h
@@ -2,7 +2,7 @@
* Copyright (C) 1998 Itai Nahshon, Michael Schimek
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */
+/* $XFree86$ */
#ifndef _XF86I2C_H
#define _XF86I2C_H
diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c
index de923b2f0..3f93b2dd3 100644
--- a/hw/xfree86/i2c/xf86i2cmodule.c
+++ b/hw/xfree86/i2c/xf86i2cmodule.c
@@ -5,7 +5,7 @@
* (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.7 1999/04/11 13:11:02 dawes Exp $ */
+/* $XFree86$ */
#include "xf86Module.h"
diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO
index bba0c774f..392329582 100644
--- a/hw/xfree86/int10/INT10.HOWTO
+++ b/hw/xfree86/int10/INT10.HOWTO
@@ -341,4 +341,4 @@ XF86_AL,XF86_BL,XF86_CL,XF86_DL to access the lower byte of the
AX,BX,CX and DX register.
-$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.3 2001/04/30 14:34:57 tsi Exp $
+$XFree86$
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 845c8a177..97c4a8d3a 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 181ebb157..3295c2e62 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.27 2003/12/23 22:32:38 tsi Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 6de89c5d9..f640bf2e7 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.26 2002/11/25 14:05:01 eich Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c
index debd842e7..b3563f585 100644
--- a/hw/xfree86/int10/pci.c
+++ b/hw/xfree86/int10/pci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.12 2002/04/04 14:05:51 eich Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
index f6b38580c..a9ac78cf1 100644
--- a/hw/xfree86/int10/stub.c
+++ b/hw/xfree86/int10/stub.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.4 2002/04/04 14:05:51 eich Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c
index a74bbeacd..3371c589d 100644
--- a/hw/xfree86/int10/xf86int10.c
+++ b/hw/xfree86/int10/xf86int10.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.11 2003/03/21 22:26:11 tsi Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h
index 843902c5e..ff7202d9b 100644
--- a/hw/xfree86/int10/xf86int10.h
+++ b/hw/xfree86/int10/xf86int10.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.24 2002/07/23 14:22:46 tsi Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c
index 9e679ca6a..eed4cf7ac 100644
--- a/hw/xfree86/int10/xf86int10module.c
+++ b/hw/xfree86/int10/xf86int10module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10module.c,v 1.2 2002/09/16 18:06:09 eich Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index 6998a0880..4cd50018d 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.13 2002/09/16 18:06:09 eich Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h
index 67c37d5f4..ea7a58295 100644
--- a/hw/xfree86/int10/xf86x86emu.h
+++ b/hw/xfree86/int10/xf86x86emu.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.2 2001/01/06 20:19:13 tsi Exp $ */
+/* $XFree86$ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment
diff --git a/hw/xfree86/loader/SparcMulDiv.S b/hw/xfree86/loader/SparcMulDiv.S
index e7281593c..b7da4c68b 100644
--- a/hw/xfree86/loader/SparcMulDiv.S
+++ b/hw/xfree86/loader/SparcMulDiv.S
@@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/SparcMulDiv.S,v 1.1 2000/11/02 19:10:54 dawes Exp $ */
+/* $XFree86$ */
.globl urem_sparcv89, umul_sparcv89, udiv_sparcv89
.globl rem_sparcv89, mul_sparcv89, div_sparcv89
diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h
index cd7807531..d83063d7f 100644
--- a/hw/xfree86/loader/aout.h
+++ b/hw/xfree86/loader/aout.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.8 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86$ */
/*
* Borrowed from NetBSD's exec_aout.h
diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c
index f77b3d73c..941ede83b 100644
--- a/hw/xfree86/loader/aoutloader.c
+++ b/hw/xfree86/loader/aoutloader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.20 2003/10/15 17:46:00 dawes Exp $ */
+/* $XFree86$ */
/*
*
diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h
index b0e156319..9ee9e2470 100644
--- a/hw/xfree86/loader/aoutloader.h
+++ b/hw/xfree86/loader/aoutloader.h
@@ -19,7 +19,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86$ */
#ifndef _AOUTLOADER_H
#define _AOUTLOADER_H
diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h
index 956b810a0..450ed9f04 100644
--- a/hw/xfree86/loader/ar.h
+++ b/hw/xfree86/loader/ar.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86$ */
#ifndef _AR_H
#define _AR_H
diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h
index 52553278e..575f05757 100644
--- a/hw/xfree86/loader/coff.h
+++ b/hw/xfree86/loader/coff.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.6 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86$ */
/* This file was implemented from the information in the book
Understanding and Using COFF
diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c
index 1ba45dd67..4fe8833d5 100644
--- a/hw/xfree86/loader/coffloader.c
+++ b/hw/xfree86/loader/coffloader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.22 2003/12/22 17:48:11 tsi Exp $ */
+/* $XFree86$ */
/*
*
diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h
index 217474671..65d0b8590 100644
--- a/hw/xfree86/loader/coffloader.h
+++ b/hw/xfree86/loader/coffloader.h
@@ -21,7 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86$ */
#ifndef _COFFLOADER_H
#define _COFFLOADER_H
diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h
index e9468e97b..6db5ffbc6 100644
--- a/hw/xfree86/loader/dlloader.h
+++ b/hw/xfree86/loader/dlloader.h
@@ -19,7 +19,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */
+/* $XFree86$ */
#ifndef _DLLOADER_H
#define _DLLOADER_H
diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h
index 91130e63d..8bf09e115 100644
--- a/hw/xfree86/loader/elf.h
+++ b/hw/xfree86/loader/elf.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.17 2003/10/15 16:29:02 dawes Exp $ */
+/* $XFree86$ */
typedef unsigned int Elf32_Addr;
typedef unsigned short Elf32_Half;
diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c
index 5ab8af62d..bcfeca0ef 100644
--- a/hw/xfree86/loader/elfloader.c
+++ b/hw/xfree86/loader/elfloader.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.62 2003/11/06 18:38:13 tsi Exp $ */
+/* $XFree86$ */
/*
*
diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h
index e4693411b..7dc84db61 100644
--- a/hw/xfree86/loader/elfloader.h
+++ b/hw/xfree86/loader/elfloader.h
@@ -21,7 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.4 2003/10/15 16:29:03 dawes Exp $ */
+/* $XFree86$ */
#ifndef _ELFLOADER_H
#define _ELFLOADER_H
diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c
index 03f415c22..4d055c5df 100644
--- a/hw/xfree86/loader/hash.c
+++ b/hw/xfree86/loader/hash.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.25 2003/11/23 00:57:56 dawes Exp $ */
+/* $XFree86$ */
/*
*
diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h
index 96cd41c02..72dd7ed90 100644
--- a/hw/xfree86/loader/hash.h
+++ b/hw/xfree86/loader/hash.h
@@ -21,7 +21,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.3 1998/07/25 16:56:16 dawes Exp $ */
+/* $XFree86$ */
#ifndef _HASH_H
#define _HASH_H
diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h
index e937b9f08..d407b1739 100644
--- a/hw/xfree86/loader/sym.h
+++ b/hw/xfree86/loader/sym.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.7 2003/10/15 16:29:04 dawes Exp $ */
+/* $XFree86$ */
/*
*
diff --git a/hw/xfree86/os-support/README.OS-lib b/hw/xfree86/os-support/README.OS-lib
index 27af6b3f2..57f7b0e89 100644
--- a/hw/xfree86/os-support/README.OS-lib
+++ b/hw/xfree86/os-support/README.OS-lib
@@ -497,7 +497,7 @@ xf86cos(double x)
-$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.10 2001/12/17 20:00:45 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 655ac4a83..972bbef23 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.6 2003/12/30 15:18:30 herrb Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 36943add1..5dec6b19d 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.2 2003/03/14 13:46:03 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c
index 6c675b5da..ffb25c0b7 100644
--- a/hw/xfree86/os-support/bsd/bsdResource.c
+++ b/hw/xfree86/os-support/bsd/bsdResource.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.9 2003/10/02 13:30:06 eich Exp $ */
+/* $XFree86$ */
/* Resource information code */
diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c
index a47dc2384..c0a8f8890 100644
--- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c
+++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_KbdMap.c,v 1.1 2002/10/11 01:40:34 dawes Exp $ */
+/* $XFree86$ */
/*
* Slightly modified xf86KbdBSD.c which is
diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c
index adb101dc5..de7136af2 100644
--- a/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.6 1998/07/25 16:56:33 dawes Exp $ */
+/* $XFree86$ */
/*
* Derived from VTsw_usl.c which is
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index 250e5cb55..6ed48d89b 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_apm.c,v 1.1 2000/02/29 03:09:25 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c
index 91367078e..c2e3725ee 100644
--- a/hw/xfree86/os-support/bsd/bsd_axp.c
+++ b/hw/xfree86/os-support/bsd/bsd_axp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c,v 1.3 2003/10/07 22:33:37 herrb Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c
index ec95306e8..009f41101 100644
--- a/hw/xfree86/os-support/bsd/bsd_ev56.c
+++ b/hw/xfree86/os-support/bsd/bsd_ev56.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.2 2001/02/27 23:05:00 alanh Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "input.h"
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index e4927d91a..33a69017e 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.22 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c
index 0f40ba707..0ea529a1c 100644
--- a/hw/xfree86/os-support/bsd/bsd_io.c
+++ b/hw/xfree86/os-support/bsd/bsd_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.23 2002/10/21 20:38:04 herrb Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c
index 7f24124dc..634ebef4f 100644
--- a/hw/xfree86/os-support/bsd/bsd_jstk.c
+++ b/hw/xfree86/os-support/bsd/bsd_jstk.c
@@ -23,7 +23,7 @@
/* Modified for FreeBSD by David Dawes <dawes@XFree86.org> */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.8 2002/08/06 13:20:47 herrb Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
#include <unistd.h>
diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c
index 3c22eeb4d..2f18356f5 100644
--- a/hw/xfree86/os-support/bsd/bsd_kbd.c
+++ b/hw/xfree86/os-support/bsd/bsd_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.9 2004/01/07 17:05:28 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright (c) 2002 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.h b/hw/xfree86/os-support/bsd/bsd_kbd.h
index c042d88bf..7b9cd434e 100644
--- a/hw/xfree86/os-support/bsd/bsd_kbd.h
+++ b/hw/xfree86/os-support/bsd/bsd_kbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */
+/* $XFree86$ */
extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
CARD8 *pModMap);
diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c
index 74345654b..37139e8dd 100644
--- a/hw/xfree86/os-support/bsd/bsd_kmod.c
+++ b/hw/xfree86/os-support/bsd/bsd_kmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */
+/* $XFree86$ */
#include <errno.h>
#include <fcntl.h>
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 75c8f8200..044ce7230 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.5 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c
index bb84e5566..2d32022e0 100644
--- a/hw/xfree86/os-support/bsd/libusb/data.c
+++ b/hw/xfree86/os-support/bsd/libusb/data.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */
+/* $XFree86$ */
#include <assert.h>
#include <stdlib.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c
index f75418964..e4fee2376 100644
--- a/hw/xfree86/os-support/bsd/libusb/descr.c
+++ b/hw/xfree86/os-support/bsd/libusb/descr.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c
index 8c1a8b8a2..14df7d705 100644
--- a/hw/xfree86/os-support/bsd/libusb/parse.c
+++ b/hw/xfree86/os-support/bsd/libusb/parse.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */
+/* $XFree86$ */
#include <assert.h>
#include <stdlib.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c
index 9338e61d4..80bcfca73 100644
--- a/hw/xfree86/os-support/bsd/libusb/usage.c
+++ b/hw/xfree86/os-support/bsd/libusb/usage.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */
+/* $XFree86$ */
#include <ctype.h>
#include <err.h>
diff --git a/hw/xfree86/os-support/bsd/libusb/usb.3 b/hw/xfree86/os-support/bsd/libusb/usb.3
index f88a28cd6..42cedb7c4 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb.3
+++ b/hw/xfree86/os-support/bsd/libusb/usb.3
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.3,v 1.1 2000/02/11 18:06:50 dawes Exp $
+.\" $XFree86$
.\"
.Dd May 11, 1999
.Dt USB 3
diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h
index 69ef79a62..543a2893e 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb.h
+++ b/hw/xfree86/os-support/bsd/libusb/usb.h
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */
+/* $XFree86$ */
#define _DIAGASSERT(e) assert(e)
diff --git a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages
index 711ba206a..dadf17765 100644
--- a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages
+++ b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages
@@ -9,7 +9,7 @@
# If the number is * then the line matches all usages and the name
# is a printf formatting string that will be given the usage number.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb_hid_usages,v 1.1 2000/02/11 18:06:51 dawes Exp $
+# $XFree86$
#
1 Generic Desktop
0x00 Undefined
diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h
index cb0bf33ec..bd1a22b05 100644
--- a/hw/xfree86/os-support/bsd/libusb/usbvar.h
+++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */
+/* $XFree86$ */
struct report_desc {
unsigned int size;
diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
index 99be9ea2f..f1d22f4fa 100644
--- a/hw/xfree86/os-support/bsd/memrange.h
+++ b/hw/xfree86/os-support/bsd/memrange.h
@@ -3,7 +3,7 @@
*
* $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */
+/* $XFree86$ */
#ifndef _MEMRANGE_H
#define _MEMRANGE_H
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 3e4ff9ee7..6a628f623 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c,v 1.6 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c
index fe301acf5..3f5fea6b7 100644
--- a/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/sparc64_video.c,v 1.3 2003/10/07 23:14:55 herrb Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index 57262efa2..a07b1a4cc 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -20,7 +20,7 @@
* 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.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.4 2003/10/02 13:30:06 eich Exp $ */
+/* $XFree86$ */
#include <fcntl.h>
#include <stdio.h>
diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c
index 04ff8b956..2847a9aa0 100644
--- a/hw/xfree86/os-support/bus/axpPci.c
+++ b/hw/xfree86/os-support/bus/axpPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1998 by Concurrent Computer Corporation
*
diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c
index 06baa69ea..dbcaffef3 100644
--- a/hw/xfree86/os-support/bus/freebsdPci.c
+++ b/hw/xfree86/os-support/bus/freebsdPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.6 2003/10/02 13:30:07 eich Exp $ */
+/* $XFree86$ */
/*
* Copyright 1998 by Concurrent Computer Corporation
*
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 76194802f..d3f3cad7d 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.10 2002/11/17 18:42:01 alanh Exp $ */
+/* $XFree86$ */
/*
* Copyright 1998 by Concurrent Computer Corporation
*
diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c
index 2aa98355b..5fdf80e36 100644
--- a/hw/xfree86/os-support/bus/ppcPci.c
+++ b/hw/xfree86/os-support/bus/ppcPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.9 2002/08/27 22:07:07 tsi Exp $ */
+/* $XFree86$ */
/*
* ppcPci.c - PowerPC PCI access functions
*
diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h
index 1f5f03bd2..b120dcc95 100644
--- a/hw/xfree86/os-support/bus/xf86Sbus.h
+++ b/hw/xfree86/os-support/bus/xf86Sbus.h
@@ -20,7 +20,7 @@
* 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.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.6 2003/10/02 13:30:07 eich Exp $ */
+/* $XFree86$ */
#ifndef _XF86_SBUS_H
#define _XF86_SBUS_H
diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c
index 8be822445..839d4702e 100644
--- a/hw/xfree86/os-support/drm/drmmodule.c
+++ b/hw/xfree86/os-support/drm/drmmodule.c
@@ -25,7 +25,7 @@
*
* Authors: Rickard E. (Rik) Faith <faith@valinux.com>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $
+ * $XFree86$
*
*/
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
index 770e377f8..2d54297ec 100644
--- a/hw/xfree86/os-support/linux/int10/linux.c
+++ b/hw/xfree86/os-support/linux/int10/linux.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.32 2004/02/05 18:24:59 eich Exp $ */
+/* $XFree86$ */
/*
* linux specific part of the int10 module
* Copyright 1999 Egbert Eich
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 dc737ac47..e9cb6125a 100644
--- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c,v 1.3 2003/11/03 05:36:33 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h
index f2dd16267..70e968fa2 100644
--- a/hw/xfree86/os-support/linux/lnx.h
+++ b/hw/xfree86/os-support/linux/lnx.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx.h,v 3.3 2002/11/25 14:05:04 eich Exp $ */
+/* $XFree86$ */
#ifndef LNX_H_
# ifdef __alpha__
diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c
index bd038351f..2c2258e08 100644
--- a/hw/xfree86/os-support/linux/lnxResource.c
+++ b/hw/xfree86/os-support/linux/lnxResource.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.19 2004/02/04 16:30:50 tsi Exp $ */
+/* $XFree86$ */
/* Resource information code */
diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c
index 25639d72d..993679d81 100644
--- a/hw/xfree86/os-support/linux/lnx_KbdMap.c
+++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v 1.1 2002/10/11 01:40:35 dawes Exp $ */
+/* $XFree86$ */
/*
* Slightly modified xf86KbdLnx.c which is
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index acac20bce..b3955e4d5 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -7,7 +7,7 @@
* Copyright © 2001 The XFree86 Project, Inc.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.12 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index f2f326959..1679bdb50 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c
index 5813ef4e9..3424bd262 100644
--- a/hw/xfree86/os-support/linux/lnx_axp.c
+++ b/hw/xfree86/os-support/linux/lnx_axp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c
index bfcb0d70f..260e17772 100644
--- a/hw/xfree86/os-support/linux/lnx_ev56.c
+++ b/hw/xfree86/os-support/linux/lnx_ev56.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "input.h"
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index cbc926bc0..e83303c02 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.15 2003/12/02 20:45:13 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Orest Zborowski <obz@Kodak.com>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c
index 7631a1ff0..a3a42a38c 100644
--- a/hw/xfree86/os-support/linux/lnx_io.c
+++ b/hw/xfree86/os-support/linux/lnx_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.26 2003/11/17 22:20:41 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Orest Zborowski <obz@Kodak.com>
* Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c
index 2423bd45e..d2183da4d 100644
--- a/hw/xfree86/os-support/linux/lnx_jstk.c
+++ b/hw/xfree86/os-support/linux/lnx_jstk.c
@@ -23,7 +23,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */
+/* $XFree86$ */
static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp";
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c
index ba18f28a1..bb9859676 100644
--- a/hw/xfree86/os-support/linux/lnx_kbd.c
+++ b/hw/xfree86/os-support/linux/lnx_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.5 2003/11/04 03:14:39 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright (c) 2002 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h
index ac783bfbc..7b9cd434e 100644
--- a/hw/xfree86/os-support/linux/lnx_kbd.h
+++ b/hw/xfree86/os-support/linux/lnx_kbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */
+/* $XFree86$ */
extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms,
CARD8 *pModMap);
diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c
index 0cb69b209..715ec6a31 100644
--- a/hw/xfree86/os-support/linux/lnx_kmod.c
+++ b/hw/xfree86/os-support/linux/lnx_kmod.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */
+/* $XFree86$ */
#include <errno.h>
#include <fcntl.h>
diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c
index 5477b9130..f6fad3cc1 100644
--- a/hw/xfree86/os-support/linux/lnx_pci.c
+++ b/hw/xfree86/os-support/linux/lnx_pci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index ad3a17fa2..4188683ec 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.68 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1992 by Orest Zborowski <obz@Kodak.com>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c
index 8565dcc5c..179b3b86a 100644
--- a/hw/xfree86/os-support/lynxos/lynx_init.c
+++ b/hw/xfree86/os-support/lynxos/lynx_init.c
@@ -22,7 +22,7 @@
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.3 1998/08/29 05:43:58 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c
index e61ce76b7..8b3ff7e78 100644
--- a/hw/xfree86/os-support/lynxos/lynx_io.c
+++ b/hw/xfree86/os-support/lynxos/lynx_io.c
@@ -21,7 +21,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.10 2003/02/17 15:11:57 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c
index dcf734965..242940f1b 100644
--- a/hw/xfree86/os-support/lynxos/lynx_mmap.c
+++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c
@@ -21,7 +21,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.6 2000/02/11 22:36:02 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c
index 858b0eb65..ac4b9f2f6 100644
--- a/hw/xfree86/os-support/lynxos/lynx_noinline.c
+++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1998 by Metro Link Incorporated
*
diff --git a/hw/xfree86/os-support/lynxos/lynx_ppc.c b/hw/xfree86/os-support/lynxos/lynx_ppc.c
index e587b7ee0..8287c3d7b 100644
--- a/hw/xfree86/os-support/lynxos/lynx_ppc.c
+++ b/hw/xfree86/os-support/lynxos/lynx_ppc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1998 by Metro Link Incorporated
*
diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c
index c667994b3..b93937bb4 100644
--- a/hw/xfree86/os-support/lynxos/lynx_video.c
+++ b/hw/xfree86/os-support/lynxos/lynx_video.c
@@ -21,7 +21,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.18 2002/12/14 04:41:14 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "input.h"
diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.S b/hw/xfree86/os-support/misc/BUSmemcpy.S
index e4ff36c62..110903a06 100644
--- a/hw/xfree86/os-support/misc/BUSmemcpy.S
+++ b/hw/xfree86/os-support/misc/BUSmemcpy.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */
+/* $XFree86$ */
/******************************************************************************
Copyright 1993 by Glenn G. Lai
diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c
index acef268a1..28cfc37bf 100644
--- a/hw/xfree86/os-support/misc/BUSmemcpy.c
+++ b/hw/xfree86/os-support/misc/BUSmemcpy.c
@@ -12,7 +12,7 @@ Thanks to Linus Torvalds for contributing this code.
****************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.4 2000/02/12 20:45:44 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c
index b5de1d899..da88d007e 100644
--- a/hw/xfree86/os-support/misc/Delay.c
+++ b/hw/xfree86/os-support/misc/Delay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.4 2003/03/25 04:18:23 dawes Exp $ */
+/* $XFree86$ */
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
diff --git a/hw/xfree86/os-support/misc/IODelay.S b/hw/xfree86/os-support/misc/IODelay.S
index 4c6e32f3f..49be3ef26 100644
--- a/hw/xfree86/os-support/misc/IODelay.S
+++ b/hw/xfree86/os-support/misc/IODelay.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S,v 1.1 1999/07/10 07:24:50 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************************
Copyright 1994 by Glenn G. Lai
diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c
index 57176c5d5..bd096b0ac 100644
--- a/hw/xfree86/os-support/misc/IODelay.c
+++ b/hw/xfree86/os-support/misc/IODelay.c
@@ -4,7 +4,7 @@
Stub for Alpha Linux
*******************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.3 2000/08/04 16:13:41 eich Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "xf86.h"
diff --git a/hw/xfree86/os-support/misc/PortIO.S b/hw/xfree86/os-support/misc/PortIO.S
index 61aac6b89..75db31156 100644
--- a/hw/xfree86/os-support/misc/PortIO.S
+++ b/hw/xfree86/os-support/misc/PortIO.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S,v 1.1 2004/02/02 03:55:32 dawes Exp $ */
+/* $XFree86$ */
/* Port I/O functions for platforms with no inlining. */
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.S b/hw/xfree86/os-support/misc/SlowBcopy.S
index 9b6af1d69..e62738b00 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.S
+++ b/hw/xfree86/os-support/misc/SlowBcopy.S
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************************
Copyright 1994 by Glenn G. Lai
diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c
index a9a8beae7..7ff7e39ad 100644
--- a/hw/xfree86/os-support/misc/SlowBcopy.c
+++ b/hw/xfree86/os-support/misc/SlowBcopy.c
@@ -4,7 +4,7 @@
for Alpha Linux
*******************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.7 2004/02/11 22:06:21 tsi Exp $ */
+/* $XFree86$ */
/*
* 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 019156357..3239e231a 100644
--- a/hw/xfree86/os-support/misc/xf86_IlHack.c
+++ b/hw/xfree86/os-support/misc/xf86_IlHack.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */
+/* $XFree86$ */
/*
* This file is an incredible crock to get the normally-inline functions
* built into the server so that things can be debugged properly.
diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c
index 7889617e3..8f1bec589 100644
--- a/hw/xfree86/os-support/misc/xf86_Util.c
+++ b/hw/xfree86/os-support/misc/xf86_Util.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.8 2001/10/28 03:34:02 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c
index 899c3820b..fd86a9c17 100644
--- a/hw/xfree86/os-support/sco/VTsw_sco.c
+++ b/hw/xfree86/os-support/sco/VTsw_sco.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.4 2003/07/07 15:34:27 eich Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
* Copyright 1993 by David McCullough <davidm@stallion.oz.au>
diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c
index 389664647..5680aad44 100644
--- a/hw/xfree86/os-support/sco/sco_init.c
+++ b/hw/xfree86/os-support/sco/sco_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.14 2002/11/20 23:00:44 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2001 by J. Kean Johnston <jkj@sco.com>
*
diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c
index a018e3434..878fa5eb3 100644
--- a/hw/xfree86/os-support/sco/sco_io.c
+++ b/hw/xfree86/os-support/sco/sco_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.10 2003/02/17 15:11:59 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2001 by J. Kean Johnston <jkj@sco.com>
*
diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c
index 85b4bbd41..913884385 100644
--- a/hw/xfree86/os-support/sco/sco_iop.c
+++ b/hw/xfree86/os-support/sco/sco_iop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_iop.c,v 1.1 2002/06/03 21:22:10 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2001 by J. Kean Johnston <jkj@caldera.com>
*
diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c
index 37b9eb5a8..4dbe9ca77 100644
--- a/hw/xfree86/os-support/sco/sco_mouse.c
+++ b/hw/xfree86/os-support/sco/sco_mouse.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.13 2002/11/20 23:07:50 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2001 by J. Kean Johnston <jkj@sco.com>
*
diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c
index 3c00f5564..b3de5ae23 100644
--- a/hw/xfree86/os-support/sco/sco_video.c
+++ b/hw/xfree86/os-support/sco/sco_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.9 2003/03/14 13:46:07 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 2001 by J. Kean Johnston <jkj@sco.com>
*
diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c
index 265a45f91..b0651cb7b 100644
--- a/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@XFree86.org>
*
diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c
index 81aac54de..72f3ef9bf 100644
--- a/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@XFree86.org>
*
diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c
index 5c24b9751..1c617b754 100644
--- a/hw/xfree86/os-support/shared/bios_devmem.c
+++ b/hw/xfree86/os-support/shared/bios_devmem.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c
index ee7584222..780c62332 100644
--- a/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/hw/xfree86/os-support/shared/bios_mmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/hw/xfree86/os-support/shared/inout.S b/hw/xfree86/os-support/shared/inout.S
index 80c47c419..26e3a123c 100644
--- a/hw/xfree86/os-support/shared/inout.S
+++ b/hw/xfree86/os-support/shared/inout.S
@@ -4,7 +4,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */
+/* $XFree86$ */
#include "assyntax.h"
diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c
index c24f4f1b2..e5a80938a 100644
--- a/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.4 2001/07/23 13:15:48 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 by David Wexelblat <dwex@XFree86.org>
*
diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c
index 329346910..19c4d918c 100644
--- a/hw/xfree86/os-support/shared/std_kbdEv.c
+++ b/hw/xfree86/os-support/shared/std_kbdEv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c
index 1bb2da386..9f5107769 100644
--- a/hw/xfree86/os-support/shared/sysv_kbd.c
+++ b/hw/xfree86/os-support/shared/sysv_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@XFree86.org>
diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h
index e63619e3a..5afef810c 100644
--- a/hw/xfree86/os-support/shared/xf86Axp.h
+++ b/hw/xfree86/os-support/shared/xf86Axp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */
+/* $XFree86$ */
#ifndef _XF86_AXP_H_
#define _XF86_AXP_H_
diff --git a/hw/xfree86/os-support/solaris/apSolaris.shar b/hw/xfree86/os-support/solaris/apSolaris.shar
index 33cecdc4d..c8e2cfa49 100644
--- a/hw/xfree86/os-support/solaris/apSolaris.shar
+++ b/hw/xfree86/os-support/solaris/apSolaris.shar
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apSolaris.shar,v 1.3 2002/10/04 19:45:33 tsi Exp $
+# $XFree86$
# This is a shell archive (produced by GNU sharutils 4.2c).
# To extract the files from this archive, save it to some FILE, remove
# everything before the `!/bin/sh' line above, then type `sh FILE'.
diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c
index e93e0e9dd..8c978f789 100644
--- a/hw/xfree86/os-support/solaris/sun_bios.c
+++ b/hw/xfree86/os-support/solaris/sun_bios.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.3 2003/11/07 13:45:27 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index b08529a00..b5e7ef8e6 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.6 2002/06/06 13:49:34 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/solaris/sun_inout.s b/hw/xfree86/os-support/solaris/sun_inout.s
index e8f03d0e8..5c0b23ef6 100644
--- a/hw/xfree86/os-support/solaris/sun_inout.s
+++ b/hw/xfree86/os-support/solaris/sun_inout.s
@@ -1,4 +1,4 @@
-/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $
+/ $XFree86$
/
/ Copyright 1994-2001 The XFree86 Project, Inc. All Rights Reserved.
/
diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c
index 27996d312..1bbde71e5 100644
--- a/hw/xfree86/os-support/solaris/sun_io.c
+++ b/hw/xfree86/os-support/solaris/sun_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c
index 058f1109a..802d8eb56 100644
--- a/hw/xfree86/os-support/solaris/sun_kbd.c
+++ b/hw/xfree86/os-support/solaris/sun_kbd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.2 2003/10/09 11:44:00 pascal Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@XFree86.org>
diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c
index f6481af29..03aceaa3d 100644
--- a/hw/xfree86/os-support/solaris/sun_kbdEv.c
+++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.6 2003/10/09 11:44:00 pascal Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
* Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 2f4b84e99..262fed628 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.3 2002/10/03 02:04:19 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c
index 1e9166712..3fde90ab7 100644
--- a/hw/xfree86/os-support/sysv/sysv_init.c
+++ b/hw/xfree86/os-support/sysv/sysv_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.5 1998/07/25 16:57:08 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c
index d48efd76e..2e79d259b 100644
--- a/hw/xfree86/os-support/sysv/sysv_io.c
+++ b/hw/xfree86/os-support/sysv/sysv_io.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.11 2003/02/17 15:12:00 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@xfree86.org>
diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c
index c0460f524..9b1c3290e 100644
--- a/hw/xfree86/os-support/sysv/sysv_video.c
+++ b/hw/xfree86/os-support/sysv/sysv_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.21 2003/03/14 13:46:08 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c
index 0478ee65e..c976a1bff 100644
--- a/hw/xfree86/os-support/sysv/xqueue.c
+++ b/hw/xfree86/os-support/sysv/xqueue.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.20 2001/03/06 18:20:31 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993-1999 by The XFree86 Project, Inc.
diff --git a/hw/xfree86/os-support/sysv/xqueue.h b/hw/xfree86/os-support/sysv/xqueue.h
index 2085a3e70..45df28275 100644
--- a/hw/xfree86/os-support/sysv/xqueue.h
+++ b/hw/xfree86/os-support/sysv/xqueue.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XF86_XQUEUE_H_
#define _XF86_XQUEUE_H_
diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h
index 917b11526..08e7dc239 100644
--- a/hw/xfree86/os-support/xf86OSKbd.h
+++ b/hw/xfree86/os-support/xf86OSKbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.6 2003/11/03 05:11:51 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright (c) 2002-2003 by The XFree86 Project, Inc.
*
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 4d3205eb4..b05b81c1b 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.95 2003/11/17 22:20:40 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1992 by David Dawes <dawes@XFree86.org>
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 09d3f2861..981d4ad1d 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -64,7 +64,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.57 2003/10/07 23:14:54 herrb Exp $ */
+/* $XFree86$ */
#ifndef _XF86_OSPROC_H
#define _XF86_OSPROC_H
diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c
index fa22e220d..b23ca3e1b 100644
--- a/hw/xfree86/parser/DRI.c
+++ b/hw/xfree86/parser/DRI.c
@@ -24,7 +24,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.14 2003/01/04 20:20:22 paulo Exp $
+ * $XFree86$
*
*/
diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c
index 3cd3749ed..d2b37a093 100644
--- a/hw/xfree86/parser/cpconfig.c
+++ b/hw/xfree86/parser/cpconfig.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86$ */
/*
*
* Copyright (c) 1997 Metro Link Incorporated
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index d8d5332f9..e138c0883 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.7 2002/09/16 18:06:18 eich Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h
index c704bd75e..7175f6960 100644
--- a/hw/xfree86/rac/xf86RAC.h
+++ b/hw/xfree86/rac/xf86RAC.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.3 1999/06/12 07:19:05 dawes Exp $ */
+/* $XFree86$ */
#ifndef __XF86RAC_H
#define __XF86RAC_H 1
diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c
index f0a960a66..2014faec8 100644
--- a/hw/xfree86/rac/xf86RACmodule.c
+++ b/hw/xfree86/rac/xf86RACmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.4 1999/01/26 05:54:14 dawes Exp $ */
+/* $XFree86$ */
#include "xf86Module.h"
diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c
index 3b42ecb13..04528aa0b 100644
--- a/hw/xfree86/ramdac/BT.c
+++ b/hw/xfree86/ramdac/BT.c
@@ -23,7 +23,7 @@
*
* BT RAMDAC routines.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h
index ea1180285..b491189ef 100644
--- a/hw/xfree86/ramdac/BT.h
+++ b/hw/xfree86/ramdac/BT.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.3 1998/08/20 08:56:03 dawes Exp $ */
+/* $XFree86$ */
#include "xf86RamDac.h"
diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h
index bea623b78..f0d64eee6 100644
--- a/hw/xfree86/ramdac/BTPriv.h
+++ b/hw/xfree86/ramdac/BTPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.2 1998/07/25 16:57:18 dawes Exp $ */
+/* $XFree86$ */
#include "BT.h"
diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES
index 3e901e380..bca01e1c1 100644
--- a/hw/xfree86/ramdac/CURSOR.NOTES
+++ b/hw/xfree86/ramdac/CURSOR.NOTES
@@ -188,4 +188,4 @@ Flags
-$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.5 2003/02/13 20:28:41 tsi Exp $
+$XFree86$
diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c
index 34562e297..c88a05cee 100644
--- a/hw/xfree86/ramdac/IBM.c
+++ b/hw/xfree86/ramdac/IBM.c
@@ -23,7 +23,7 @@
*
* IBM RAMDAC routines.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.13 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h
index 546296630..a37ab0e43 100644
--- a/hw/xfree86/ramdac/IBM.h
+++ b/hw/xfree86/ramdac/IBM.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.8 2001/10/28 03:34:03 tsi Exp $ */
+/* $XFree86$ */
#include <xf86RamDac.h>
diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h
index 6fecb7705..549d6e1ec 100644
--- a/hw/xfree86/ramdac/IBMPriv.h
+++ b/hw/xfree86/ramdac/IBMPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */
+/* $XFree86$ */
#include "IBM.h"
diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c
index 5e466b707..471836690 100644
--- a/hw/xfree86/ramdac/TI.c
+++ b/hw/xfree86/ramdac/TI.c
@@ -24,7 +24,7 @@
* Modified from IBM.c to support TI RAMDAC routines
* by Jens Owen, <jens@tungstengraphics.com>.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h
index 9451f814c..c8e732ad5 100644
--- a/hw/xfree86/ramdac/TI.h
+++ b/hw/xfree86/ramdac/TI.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.5 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86$ */
#include <xf86RamDac.h>
diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h
index d81552764..be06deb2e 100644
--- a/hw/xfree86/ramdac/TIPriv.h
+++ b/hw/xfree86/ramdac/TIPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 2000/03/21 21:15:28 alanh Exp $ */
+/* $XFree86$ */
#include "TI.h"
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 49379e934..2015026f5 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.20 2003/02/24 20:43:54 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_ansic.h"
diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h
index 5e5df46f3..676a38b23 100644
--- a/hw/xfree86/ramdac/xf86Cursor.h
+++ b/hw/xfree86/ramdac/xf86Cursor.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.11 2003/02/15 03:14:47 tsi Exp $ */
+/* $XFree86$ */
#ifndef _XF86CURSOR_H
#define _XF86CURSOR_H
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index 5a6ab118a..e2d21b6be 100644
--- a/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.5 2003/02/15 03:14:47 tsi Exp $ */
+/* $XFree86$ */
#ifndef _XF86CURSORPRIV_H
#define _XF86CURSORPRIV_H
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 41b623a6a..2beb63b1c 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.13 2003/03/04 21:21:15 mvojkovi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c
index b45be814d..21bbe01f1 100644
--- a/hw/xfree86/ramdac/xf86RamDac.c
+++ b/hw/xfree86/ramdac/xf86RamDac.c
@@ -23,7 +23,7 @@
*
* Generic RAMDAC access routines.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.7 2003/11/03 05:11:53 tsi Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h
index 626a8b2b9..6f29d294b 100644
--- a/hw/xfree86/ramdac/xf86RamDac.h
+++ b/hw/xfree86/ramdac/xf86RamDac.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.11 2000/03/21 21:15:28 alanh Exp $ */
+/* $XFree86$ */
#ifndef _XF86RAMDAC_H
#define _XF86RAMDAC_H 1
diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c
index 3b01081df..3da419a81 100644
--- a/hw/xfree86/ramdac/xf86RamDacCmap.c
+++ b/hw/xfree86/ramdac/xf86RamDacCmap.c
@@ -23,7 +23,7 @@
*
* Generic RAMDAC access to colormaps.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.7 2000/07/26 01:52:24 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c
index 754949606..9ec2f672d 100644
--- a/hw/xfree86/ramdac/xf86RamDacMod.c
+++ b/hw/xfree86/ramdac/xf86RamDacMod.c
@@ -23,7 +23,7 @@
*
* Generic RAMDAC module.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */
+/* $XFree86$ */
#include "xf86Module.h"
diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h
index f1eeb3a7d..ea1e2765c 100644
--- a/hw/xfree86/ramdac/xf86RamDacPriv.h
+++ b/hw/xfree86/ramdac/xf86RamDacPriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.4 1999/07/18 03:27:02 dawes Exp $ */
+/* $XFree86$ */
#include "xf86RamDac.h"
#include "xf86cmap.h"
diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids
index 2f346978b..381c92b59 100644
--- a/hw/xfree86/scanpci/extrapci.ids
+++ b/hw/xfree86/scanpci/extrapci.ids
@@ -14,7 +14,7 @@
# changes/additions that aren't XFree86-specific to the pciids
# project (http://pciids.sf.net/).
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $
+# $XFree86$
#
# Vendors, devices and subsystems. Please keep sorted.
diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c
index 534c8973f..e7c1e4074 100644
--- a/hw/xfree86/scanpci/xf86ScanPci.c
+++ b/hw/xfree86/scanpci/xf86ScanPci.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.14 2003/09/23 05:21:46 dawes Exp $ */
+/* $XFree86$ */
/*
* Display the Subsystem Vendor Id and Subsystem Id in order to identify
* the cards installed in this computer
diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c
index 3bb14b0a9..f129b239a 100644
--- a/hw/xfree86/shadowfb/sfbmodule.c
+++ b/hw/xfree86/shadowfb/sfbmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.2 1999/02/01 12:08:45 dawes Exp $ */
+/* $XFree86$ */
#ifdef XFree86LOADER
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 093f35b30..b4833f638 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -6,7 +6,7 @@
Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.21 2003/11/10 18:22:38 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h
index d028980bd..206646d07 100644
--- a/hw/xfree86/shadowfb/shadowfb.h
+++ b/hw/xfree86/shadowfb/shadowfb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.4 2003/02/18 19:10:35 alanh Exp $ */
+/* $XFree86$ */
#ifndef _SHADOWFB_H
#define _SHADOWFB_H
diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c
index b0d9de058..95a1169fa 100644
--- a/hw/xfree86/utils/gtf/gtf.c
+++ b/hw/xfree86/utils/gtf/gtf.c
@@ -102,7 +102,7 @@
* o Error checking.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.3 2002/12/21 02:35:20 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/gtf/gtf.man.pre
index f2d2ae9ec..ea76684f3 100644
--- a/hw/xfree86/utils/gtf/gtf.man.pre
+++ b/hw/xfree86/utils/gtf/gtf.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1 2002/11/12 01:31:23 dawes Exp $
+.\" $XFree86$
.TH GTF 1 __vendorversion__
.SH NAME
gtf - calculate VESA GTF mode lines
diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c
index b977936d3..36dcc985d 100644
--- a/hw/xfree86/utils/ioport/ioport.c
+++ b/hw/xfree86/utils/ioport/ioport.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.5 2004/01/05 16:42:10 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
index f7d07eb79..2bbbe0b56 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.6 1998/07/26 09:56:17 dawes Exp $ */
+/* $XFree86$ */
/* Keyboard mode control program for 386BSD */
diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
index 677663d7e..938813a3c 100644
--- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
+++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.5 2001/01/27 18:20:56 dawes Exp $
+.\" $XFree86$
.TH KBD_MODE 1 __vendorversion__
.SH NAME
kbd_mode \- recover the PC console keyboard
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
index e70fb2db7..879e959a4 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.12 2003/10/07 21:39:43 herrb Exp $ */
+/* $XFree86$ */
/*
static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13";
diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
index 528ed12f0..e6bf53327 100644
--- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
+++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.man.pre
@@ -24,7 +24,7 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.7 2001/12/14 19:59:42 dawes Exp $
+.\" $XFree86$
.\"
.TH KBD_MODE 1 __xorgversion__
.SH NAME
diff --git a/hw/xfree86/utils/pcitweak/pcitweak.man.pre b/hw/xfree86/utils/pcitweak/pcitweak.man.pre
index 14cfa885f..83dad06a6 100644
--- a/hw/xfree86/utils/pcitweak/pcitweak.man.pre
+++ b/hw/xfree86/utils/pcitweak/pcitweak.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.4 2003/05/29 21:48:09 herrb Exp $
+.\" $XFree86$
.TH PCITWEAK 1 __vendorversion__
.SH NAME
pcitweak - read/write PCI config space
diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c
index 6093bd31a..0a5a6e6d4 100644
--- a/hw/xfree86/utils/scanpci/scanpci.c
+++ b/hw/xfree86/utils/scanpci/scanpci.c
@@ -23,7 +23,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.92 2003/02/13 12:17:14 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/hw/xfree86/utils/scanpci/scanpci.man.pre b/hw/xfree86/utils/scanpci/scanpci.man.pre
index baf231603..df1c42e8b 100644
--- a/hw/xfree86/utils/scanpci/scanpci.man.pre
+++ b/hw/xfree86/utils/scanpci/scanpci.man.pre
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.3 2001/01/27 18:20:56 dawes Exp $
+.\" $XFree86$
.TH SCANPCI 1 __vendorversion__
.SH NAME
scanpci - scan/probe PCI buses
diff --git a/hw/xfree86/utils/xorgcfg/TODO b/hw/xfree86/utils/xorgcfg/TODO
index 75fe91b95..b830f7529 100644
--- a/hw/xfree86/utils/xorgcfg/TODO
+++ b/hw/xfree86/utils/xorgcfg/TODO
@@ -1,4 +1,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/TODO,v 1.1 2001/07/04 16:09:14 paulo Exp $
+$XFree86$
o Have code to fetch the SymTabRec chipset list from a video driver.
This is mostly useful for the testing tool/interface, so that the
diff --git a/hw/xfree86/utils/xorgcfg/accessx.c b/hw/xfree86/utils/xorgcfg/accessx.c
index 40727ff62..8a3fd9c7c 100644
--- a/hw/xfree86/utils/xorgcfg/accessx.c
+++ b/hw/xfree86/utils/xorgcfg/accessx.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.10 2002/12/05 19:31:18 paulo Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c
index 5299025f1..09eb0df04 100644
--- a/hw/xfree86/utils/xorgcfg/card-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/card-cfg.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h
index 14411440d..156da456f 100644
--- a/hw/xfree86/utils/xorgcfg/card-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/card-cfg.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/card.xbm b/hw/xfree86/utils/xorgcfg/card.xbm
index b3cbba322..231adcaae 100644
--- a/hw/xfree86/utils/xorgcfg/card.xbm
+++ b/hw/xfree86/utils/xorgcfg/card.xbm
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ * $XFree86$
*/
#define card_width 50
#define card_height 44
diff --git a/hw/xfree86/utils/xorgcfg/card.xpm b/hw/xfree86/utils/xorgcfg/card.xpm
index d68257469..32bccb689 100644
--- a/hw/xfree86/utils/xorgcfg/card.xpm
+++ b/hw/xfree86/utils/xorgcfg/card.xpm
@@ -27,7 +27,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm,v 1.1 2000/04/04 22:36:57 dawes Exp $
+ * $XFree86$
*/
static char * card_xpm[] = {
"41 40 8 1",
diff --git a/hw/xfree86/utils/xorgcfg/cards.c b/hw/xfree86/utils/xorgcfg/cards.c
index d5805fa98..e0e8264f5 100644
--- a/hw/xfree86/utils/xorgcfg/cards.c
+++ b/hw/xfree86/utils/xorgcfg/cards.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.15 2003/02/15 05:37:58 paulo Exp $
+ * $XFree86$
*/
#define CARDS_PRIVATE
diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h
index 0e5ee328f..92520f0ed 100644
--- a/hw/xfree86/utils/xorgcfg/cards.h
+++ b/hw/xfree86/utils/xorgcfg/cards.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.3 2002/07/15 20:46:04 dawes Exp $
+ * $XFree86$
*/
#include <stdio.h>
diff --git a/hw/xfree86/utils/xorgcfg/computer.xpm b/hw/xfree86/utils/xorgcfg/computer.xpm
index 75fc85b26..9167e3eaf 100644
--- a/hw/xfree86/utils/xorgcfg/computer.xpm
+++ b/hw/xfree86/utils/xorgcfg/computer.xpm
@@ -27,7 +27,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm,v 1.1 2000/04/04 22:36:58 dawes Exp $
+ * $XFree86$
*/
static char * computer_xpm[] = {
"30 50 8 1",
diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c
index 8c2da3d9b..4ed2efc16 100644
--- a/hw/xfree86/utils/xorgcfg/config.c
+++ b/hw/xfree86/utils/xorgcfg/config.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.9 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h
index aa38d520f..0ac1ab925 100644
--- a/hw/xfree86/utils/xorgcfg/config.h
+++ b/hw/xfree86/utils/xorgcfg/config.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.22 2004/02/14 17:53:49 dawes Exp $
+ * $XFree86$
*/
#include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c
index a3dfcbe2d..99c887c09 100644
--- a/hw/xfree86/utils/xorgcfg/expert.c
+++ b/hw/xfree86/utils/xorgcfg/expert.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c
index 2ae68a082..8fdf6c18e 100644
--- a/hw/xfree86/utils/xorgcfg/help.c
+++ b/hw/xfree86/utils/xorgcfg/help.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
#include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h
index f03e01b14..ba97da009 100644
--- a/hw/xfree86/utils/xorgcfg/help.h
+++ b/hw/xfree86/utils/xorgcfg/help.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h,v 1.1 2000/06/13 23:15:51 dawes Exp $
+ * $XFree86$
*/
/* help string definitions */
diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c
index 68a1873ed..678e0ba19 100644
--- a/hw/xfree86/utils/xorgcfg/interface.c
+++ b/hw/xfree86/utils/xorgcfg/interface.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.37 2002/10/21 04:18:36 paulo Exp $
+ * $XFree86$
*/
#include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
index 87989fdc2..b8c448efc 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.22 2003/01/01 19:22:24 paulo Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
index 6ff63c002..36ea4cf1c 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.3 2001/03/02 22:39:27 paulo Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xbm b/hw/xfree86/utils/xorgcfg/keyboard.xbm
index 69d4aac42..5114bee3e 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard.xbm
+++ b/hw/xfree86/utils/xorgcfg/keyboard.xbm
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm,v 1.1 2000/04/04 22:36:59 dawes Exp $
+ * $XFree86$
*/
#define keyboard_width 50
#define keyboard_height 44
diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xpm b/hw/xfree86/utils/xorgcfg/keyboard.xpm
index 5ef7b605d..200ba7f42 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard.xpm
+++ b/hw/xfree86/utils/xorgcfg/keyboard.xpm
@@ -27,7 +27,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm,v 1.1 2000/04/04 22:36:59 dawes Exp $
+ * $XFree86$
*/
static char * card_xpm[] = {
"60 28 5 1",
diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c
index fb3d3f5fc..eec3b7b52 100644
--- a/hw/xfree86/utils/xorgcfg/loader.c
+++ b/hw/xfree86/utils/xorgcfg/loader.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h
index f3f8490bc..4c042ef42 100644
--- a/hw/xfree86/utils/xorgcfg/loader.h
+++ b/hw/xfree86/utils/xorgcfg/loader.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.7 2001/07/09 23:45:24 paulo Exp $
+ * $XFree86$
*/
#ifdef USE_MODULES
diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c
index e3f4e9f47..28ae1a4cc 100644
--- a/hw/xfree86/utils/xorgcfg/loadmod.c
+++ b/hw/xfree86/utils/xorgcfg/loadmod.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $
+ * $XFree86$
*/
#ifdef USE_MODULES
diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c
index 6ed095416..4f4fd38da 100644
--- a/hw/xfree86/utils/xorgcfg/monitor-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.8 2003/09/11 10:08:38 eich Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h
index 03ca18a41..1d3eeb563 100644
--- a/hw/xfree86/utils/xorgcfg/monitor-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.3 2000/11/30 20:55:18 paulo Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/monitor.xbm b/hw/xfree86/utils/xorgcfg/monitor.xbm
index c4b01eb74..972388a92 100644
--- a/hw/xfree86/utils/xorgcfg/monitor.xbm
+++ b/hw/xfree86/utils/xorgcfg/monitor.xbm
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ * $XFree86$
*/
#define monitor_width 50
#define monitor_height 44
diff --git a/hw/xfree86/utils/xorgcfg/monitor.xpm b/hw/xfree86/utils/xorgcfg/monitor.xpm
index c694edf2e..e647e3cc1 100644
--- a/hw/xfree86/utils/xorgcfg/monitor.xpm
+++ b/hw/xfree86/utils/xorgcfg/monitor.xpm
@@ -27,7 +27,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ * $XFree86$
*/
static char * monitor_xpm[] = {
"47 40 6 1",
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c
index 17a1c0caf..d0dc8f1b2 100644
--- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h
index 249f50840..6c67d9d5e 100644
--- a/hw/xfree86/utils/xorgcfg/mouse-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/mouse.xbm b/hw/xfree86/utils/xorgcfg/mouse.xbm
index 8577137e6..3f6bce72f 100644
--- a/hw/xfree86/utils/xorgcfg/mouse.xbm
+++ b/hw/xfree86/utils/xorgcfg/mouse.xbm
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm,v 1.1 2000/04/04 22:37:01 dawes Exp $
+ * $XFree86$
*/
#define mouse_width 50
#define mouse_height 44
diff --git a/hw/xfree86/utils/xorgcfg/mouse.xpm b/hw/xfree86/utils/xorgcfg/mouse.xpm
index 7ad21fb8f..ea157c266 100644
--- a/hw/xfree86/utils/xorgcfg/mouse.xpm
+++ b/hw/xfree86/utils/xorgcfg/mouse.xpm
@@ -27,7 +27,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm,v 1.1 2000/04/04 22:37:01 dawes Exp $
+ * $XFree86$
*/
static char * mouse_xpm[] = {
"26 35 8 1",
diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c
index 10828a94a..99ce5f9df 100644
--- a/hw/xfree86/utils/xorgcfg/options.c
+++ b/hw/xfree86/utils/xorgcfg/options.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.12 2001/11/03 20:32:31 paulo Exp $
+ * $XFree86$
*/
#include "options.h"
diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h
index a90072607..3a1020f2c 100644
--- a/hw/xfree86/utils/xorgcfg/options.h
+++ b/hw/xfree86/utils/xorgcfg/options.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.7 2001/07/06 02:04:10 paulo Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c
index 9390afc6d..8f4004e0e 100644
--- a/hw/xfree86/utils/xorgcfg/screen-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/screen-cfg.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h
index a152f6188..e9cba701c 100644
--- a/hw/xfree86/utils/xorgcfg/screen-cfg.h
+++ b/hw/xfree86/utils/xorgcfg/screen-cfg.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c
index 25fd5f290..002c3ca09 100644
--- a/hw/xfree86/utils/xorgcfg/screen.c
+++ b/hw/xfree86/utils/xorgcfg/screen.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.9 2002/06/06 21:03:32 paulo Exp $
+ * $XFree86$
*/
#include <X11/IntrinsicP.h>
diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h
index 7c3e2c75f..a0f1eee24 100644
--- a/hw/xfree86/utils/xorgcfg/screen.h
+++ b/hw/xfree86/utils/xorgcfg/screen.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.3 2000/12/01 18:31:07 paulo Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c
index 23b0ecf5a..0b463a76e 100644
--- a/hw/xfree86/utils/xorgcfg/startx.c
+++ b/hw/xfree86/utils/xorgcfg/startx.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.8 2002/10/19 20:04:21 herrb Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c
index 6496bc868..e67c251bd 100644
--- a/hw/xfree86/utils/xorgcfg/stubs.c
+++ b/hw/xfree86/utils/xorgcfg/stubs.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.4 2003/03/25 04:18:25 dawes Exp $
+ * $XFree86$
*/
#include <stdio.h>
diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h
index d554ac17a..94f0fddaa 100644
--- a/hw/xfree86/utils/xorgcfg/stubs.h
+++ b/hw/xfree86/utils/xorgcfg/stubs.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.3 2001/08/01 00:44:57 tsi Exp $
+ * $XFree86$
*/
#ifndef _xf86cfg_stubs_h
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index 2011d1abd..622b50123 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.26 2003/11/14 02:40:22 dawes Exp $
+ * $XFree86$
*/
#include <stdio.h>
diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c
index 3a51310d9..3de7b8d99 100644
--- a/hw/xfree86/utils/xorgcfg/vidmode.c
+++ b/hw/xfree86/utils/xorgcfg/vidmode.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $
+ * $XFree86$
*/
/*
diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h
index e445517cd..975bdbb04 100644
--- a/hw/xfree86/utils/xorgcfg/vidmode.h
+++ b/hw/xfree86/utils/xorgcfg/vidmode.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.3 2001/07/07 23:00:43 paulo Exp $
+ * $XFree86$
*/
#ifndef _xf86cfg_vidmode_h
diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c
index cb4054a5e..18ba1edee 100644
--- a/hw/xfree86/utils/xorgcfg/xf86config.c
+++ b/hw/xfree86/utils/xorgcfg/xf86config.c
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.6 2003/11/03 05:11:59 tsi Exp $
+ * $XFree86$
*/
#include "xf86config.h"
diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h
index 575c3c9d0..66ec757a0 100644
--- a/hw/xfree86/utils/xorgcfg/xf86config.h
+++ b/hw/xfree86/utils/xorgcfg/xf86config.h
@@ -26,7 +26,7 @@
*
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.4 2000/11/30 20:55:18 paulo Exp $
+ * $XFree86$
*/
#include "config.h"
diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards
index 83d8840ea..ed783ff14 100644
--- a/hw/xfree86/utils/xorgconfig/Cards
+++ b/hw/xfree86/utils/xorgconfig/Cards
@@ -18,7 +18,7 @@
# The majority of entries are just a binding of a model name to a
# chipset/server and untested.
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $
+# $XFree86$
# VGA
diff --git a/hw/xfree86/utils/xorgconfig/Cards98 b/hw/xfree86/utils/xorgconfig/Cards98
index cfd96dc16..b8193b445 100644
--- a/hw/xfree86/utils/xorgconfig/Cards98
+++ b/hw/xfree86/utils/xorgconfig/Cards98
@@ -1,4 +1,4 @@
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.1 1999/07/11 10:50:41 dawes Exp $
+# $XFree86$
#
#
#
diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c
index 8aac06606..cfd8b7ea4 100644
--- a/hw/xfree86/utils/xorgconfig/cards.c
+++ b/hw/xfree86/utils/xorgconfig/cards.c
@@ -4,7 +4,7 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */
+/* $XFree86$ */
/*
* Functions to manipulate card database.
diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h
index c5299e899..c89368784 100644
--- a/hw/xfree86/utils/xorgconfig/cards.h
+++ b/hw/xfree86/utils/xorgconfig/cards.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */
+/* $XFree86$ */
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 07659d943..244d6aa2a 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */
+/* $XFree86$ */
/*
* XFree86 vbe module
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h
index 3a1b48749..300ba4977 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/vbe/vbe.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.5 2004/02/02 03:55:32 dawes Exp $ */
+/* $XFree86$ */
/*
* XFree86 vbe module
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index ae16d7b75..c11bf316d 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -27,7 +27,7 @@
*
* Authors: David Dawes <dawes@xfree86.org>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $
+ * $XFree86$
*/
#include "xf86.h"
diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h
index b3c57b917..6599da863 100644
--- a/hw/xfree86/vbe/vbeModes.h
+++ b/hw/xfree86/vbe/vbeModes.h
@@ -26,7 +26,7 @@
*
* Authors: David Dawes <dawes@xfree86.org>
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $
+ * $XFree86$
*/
#ifndef _VBE_MODES_H
diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c
index 65b161a2c..54cec089a 100644
--- a/hw/xfree86/vbe/vbe_module.c
+++ b/hw/xfree86/vbe/vbe_module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */
+/* $XFree86$ */
#include "xf86.h"
#include "xf86str.h"
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index a70f572b5..a6e352dbc 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */
+/* $XFree86$ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
diff --git a/hw/xfree86/x86emu/debug.c b/hw/xfree86/x86emu/debug.c
index 7519b35c3..84056e780 100644
--- a/hw/xfree86/x86emu/debug.c
+++ b/hw/xfree86/x86emu/debug.c
@@ -36,7 +36,7 @@
* emulator.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */
+/* $XFree86$ */
#include "x86emu/x86emui.h"
#ifdef IN_MODULE
diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index b9eb1ad79..04596937b 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -37,7 +37,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
+/* $XFree86$ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/fpu.c b/hw/xfree86/x86emu/fpu.c
index 0f679bde6..4b801dc94 100644
--- a/hw/xfree86/x86emu/fpu.c
+++ b/hw/xfree86/x86emu/fpu.c
@@ -36,7 +36,7 @@
* emulation of the FPU instructions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/fpu.c,v 1.2 2003/10/22 20:03:06 tsi Exp $ */
+/* $XFree86$ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 94041f6c8..99d4aa9da 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -70,7 +70,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.9 2003/10/22 20:03:06 tsi Exp $ */
+/* $XFree86$ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c
index 47c49ad52..ddb1c05c9 100644
--- a/hw/xfree86/x86emu/ops2.c
+++ b/hw/xfree86/x86emu/ops2.c
@@ -37,7 +37,7 @@
* instructions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.7 2004/02/06 17:15:28 tsi Exp $ */
+/* $XFree86$ */
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c
index d493ae837..3405f0d87 100644
--- a/hw/xfree86/x86emu/sys.c
+++ b/hw/xfree86/x86emu/sys.c
@@ -39,7 +39,7 @@
* user library.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.7 2002/12/24 17:42:58 tsi Exp $ */
+/* $XFree86$ */
#include "x86emu.h"
#include "x86emu/x86emui.h"
diff --git a/hw/xfree86/x86emu/x86emu.h b/hw/xfree86/x86emu/x86emu.h
index de989b83f..1df9ac50d 100644
--- a/hw/xfree86/x86emu/x86emu.h
+++ b/hw/xfree86/x86emu/x86emu.h
@@ -37,7 +37,7 @@
* include this header
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu.h,v 1.3 2002/09/16 18:05:17 eich Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_X86EMU_H
#define __X86EMU_X86EMU_H
diff --git a/hw/xfree86/x86emu/x86emu/debug.h b/hw/xfree86/x86emu/x86emu/debug.h
index 56221cbba..754e7dbcb 100644
--- a/hw/xfree86/x86emu/x86emu/debug.h
+++ b/hw/xfree86/x86emu/x86emu/debug.h
@@ -35,7 +35,7 @@
* Description: Header file for debug definitions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.4 2000/11/21 23:10:27 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_DEBUG_H
#define __X86EMU_DEBUG_H
diff --git a/hw/xfree86/x86emu/x86emu/decode.h b/hw/xfree86/x86emu/x86emu/decode.h
index d134f4294..bb2bc0bee 100644
--- a/hw/xfree86/x86emu/x86emu/decode.h
+++ b/hw/xfree86/x86emu/x86emu/decode.h
@@ -35,7 +35,7 @@
* Description: Header file for instruction decoding logic.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/decode.h,v 1.3 2002/07/23 01:51:03 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_DECODE_H
#define __X86EMU_DECODE_H
diff --git a/hw/xfree86/x86emu/x86emu/fpu_regs.h b/hw/xfree86/x86emu/x86emu/fpu_regs.h
index b975b87e0..122e77e66 100644
--- a/hw/xfree86/x86emu/x86emu/fpu_regs.h
+++ b/hw/xfree86/x86emu/x86emu/fpu_regs.h
@@ -35,7 +35,7 @@
* Description: Header file for FPU register definitions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu/fpu_regs.h,v 1.3 2003/10/28 16:01:40 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_FPU_REGS_H
#define __X86EMU_FPU_REGS_H
diff --git a/hw/xfree86/x86emu/x86emu/prim_asm.h b/hw/xfree86/x86emu/x86emu/prim_asm.h
index 4fa8d5503..041255f18 100644
--- a/hw/xfree86/x86emu/x86emu/prim_asm.h
+++ b/hw/xfree86/x86emu/x86emu/prim_asm.h
@@ -39,7 +39,7 @@
* platform.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_PRIM_ASM_H
#define __X86EMU_PRIM_ASM_H
diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h
index 3a4580138..2a235bc18 100644
--- a/hw/xfree86/x86emu/x86emu/regs.h
+++ b/hw/xfree86/x86emu/x86emu/regs.h
@@ -35,7 +35,7 @@
* Description: Header file for x86 register definitions.
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu/regs.h,v 1.6 2003/10/28 16:01:40 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_REGS_H
#define __X86EMU_REGS_H
diff --git a/hw/xfree86/x86emu/x86emu/types.h b/hw/xfree86/x86emu/x86emu/types.h
index 3a0dc17fc..e9bea73db 100644
--- a/hw/xfree86/x86emu/x86emu/types.h
+++ b/hw/xfree86/x86emu/x86emu/types.h
@@ -36,7 +36,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.7 2003/07/07 15:34:21 eich Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_TYPES_H
#define __X86EMU_TYPES_H
diff --git a/hw/xfree86/x86emu/x86emu/x86emui.h b/hw/xfree86/x86emu/x86emu/x86emui.h
index 9cdb0a1b3..d6d6e5222 100644
--- a/hw/xfree86/x86emu/x86emu/x86emui.h
+++ b/hw/xfree86/x86emu/x86emu/x86emui.h
@@ -38,7 +38,7 @@
*
****************************************************************************/
-/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.4 2001/04/01 13:59:58 tsi Exp $ */
+/* $XFree86$ */
#ifndef __X86EMU_X86EMUI_H
#define __X86EMU_X86EMUI_H
diff --git a/hw/xfree86/xaa/XAA.HOWTO b/hw/xfree86/xaa/XAA.HOWTO
index 95d9d6100..223f204b0 100644
--- a/hw/xfree86/xaa/XAA.HOWTO
+++ b/hw/xfree86/xaa/XAA.HOWTO
@@ -1424,4 +1424,4 @@ void DisableClipping (ScrnInfoPtr pScrn)
pixmap with a particular dimension is allowed, then your driver will be
expected to render primitives as large as that pixmap.
-$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.13 2001/05/22 18:51:09 mvojkovi Exp $
+$XFree86$
diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h
index f183f8f02..9f1ffd2c3 100644
--- a/hw/xfree86/xaa/xaa.h
+++ b/hw/xfree86/xaa/xaa.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.39 2002/10/30 12:52:43 alanh Exp $ */
+/* $XFree86$ */
#ifndef _XAA_H
#define _XAA_H
diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c
index 83850767a..cc440691d 100644
--- a/hw/xfree86/xaa/xaaBitBlt.c
+++ b/hw/xfree86/xaa/xaaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */
+/* $XFree86$ */
/*
This is a lighter version of cfbBitBlt. We calculate the boxes
diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c
index d7f3ba2a3..dae862f03 100644
--- a/hw/xfree86/xaa/xaaBitOrder.c
+++ b/hw/xfree86/xaa/xaaBitOrder.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86$ */
#include "Xmd.h"
CARD32 XAAReverseBitOrder(CARD32 v);
diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c
index 9a8749dbf..06b8c2d95 100644
--- a/hw/xfree86/xaa/xaaBitmap.c
+++ b/hw/xfree86/xaa/xaaBitmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.10 2000/09/01 05:49:45 mvojkovi Exp $ */
+/* $XFree86$ */
#include "xaa.h"
diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c
index 497c3e7a1..b5d39b51f 100644
--- a/hw/xfree86/xaa/xaaCpyArea.c
+++ b/hw/xfree86/xaa/xaaCpyArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c
index d3d1c8a5c..759638b34 100644
--- a/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/hw/xfree86/xaa/xaaCpyPlane.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */
+/* $XFree86$ */
/*
A CopyPlane function that handles bitmap->screen copies and
diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c
index b77be1ad6..e2b941dd8 100644
--- a/hw/xfree86/xaa/xaaCpyWin.c
+++ b/hw/xfree86/xaa/xaaCpyWin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c
index 212116ae4..499ab57c8 100644
--- a/hw/xfree86/xaa/xaaDashLine.c
+++ b/hw/xfree86/xaa/xaaDashLine.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "misc.h"
diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c
index 01b4bb408..bf73ca9f0 100644
--- a/hw/xfree86/xaa/xaaFallback.c
+++ b/hw/xfree86/xaa/xaaFallback.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c
index 352d8e084..e04089357 100644
--- a/hw/xfree86/xaa/xaaFillArc.c
+++ b/hw/xfree86/xaa/xaaFillArc.c
@@ -21,7 +21,7 @@
*
* Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */
+/* $XFree86$ */
/*
* Filled solid arcs, based on cfbfillarc.c.
diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c
index 5566f51e6..033eae209 100644
--- a/hw/xfree86/xaa/xaaFillPoly.c
+++ b/hw/xfree86/xaa/xaaFillPoly.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1996 The XFree86 Project
diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c
index cda56e327..68d1f45f7 100644
--- a/hw/xfree86/xaa/xaaFillRect.c
+++ b/hw/xfree86/xaa/xaaFillRect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index c9ef93a1b..cefd8c77e 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c
index ab6cb9a24..bb6cbc4ba 100644
--- a/hw/xfree86/xaa/xaaGCmisc.c
+++ b/hw/xfree86/xaa/xaaGCmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c
index c3db7ff57..756541e64 100644
--- a/hw/xfree86/xaa/xaaImage.c
+++ b/hw/xfree86/xaa/xaaImage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 5237e8b2c..e3688ff5b 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 1b1bc1830..ae1f8c2ac 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c
index 2084e8d61..fece4618d 100644
--- a/hw/xfree86/xaa/xaaLine.c
+++ b/hw/xfree86/xaa/xaaLine.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "misc.h"
diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c
index 370921002..0d6207314 100644
--- a/hw/xfree86/xaa/xaaLineMisc.c
+++ b/hw/xfree86/xaa/xaaLineMisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c
index 234d242c4..1b19dc993 100644
--- a/hw/xfree86/xaa/xaaNonTEGlyph.c
+++ b/hw/xfree86/xaa/xaaNonTEGlyph.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.6 1999/11/06 23:14:46 mvojkovi Exp $ */
+/* $XFree86$ */
#include "xaa.h"
diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c
index e1c57588a..f18fe2c43 100644
--- a/hw/xfree86/xaa/xaaNonTEText.c
+++ b/hw/xfree86/xaa/xaaNonTEText.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c
index 0fb1db365..768c86c68 100644
--- a/hw/xfree86/xaa/xaaOffscreen.c
+++ b/hw/xfree86/xaa/xaaOffscreen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1999 - The XFree86 Project Inc.
diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c
index d527b7c15..6cf323ecd 100644
--- a/hw/xfree86/xaa/xaaOverlay.c
+++ b/hw/xfree86/xaa/xaaOverlay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
index 5cce3e7ed..14e11fc90 100644
--- a/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/hw/xfree86/xaa/xaaOverlayDF.c
@@ -3,7 +3,7 @@
Written by Mark Vojkovich
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c
index c7756ba93..efd3dc428 100644
--- a/hw/xfree86/xaa/xaaPCache.c
+++ b/hw/xfree86/xaa/xaaPCache.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c
index 2adf42466..0d143cb6f 100644
--- a/hw/xfree86/xaa/xaaPaintWin.c
+++ b/hw/xfree86/xaa/xaaPaintWin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c
index ce72d742c..bd6e09b72 100644
--- a/hw/xfree86/xaa/xaaPict.c
+++ b/hw/xfree86/xaa/xaaPict.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c
index 4075bab6a..70a7b1d7d 100644
--- a/hw/xfree86/xaa/xaaROP.c
+++ b/hw/xfree86/xaa/xaaROP.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "misc.h"
diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c
index fe8d70de2..cf6bab4cb 100644
--- a/hw/xfree86/xaa/xaaRect.c
+++ b/hw/xfree86/xaa/xaaRect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c
index 522225665..534fad8aa 100644
--- a/hw/xfree86/xaa/xaaSpans.c
+++ b/hw/xfree86/xaa/xaaSpans.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
index b27a54e81..4d8ac41ea 100644
--- a/hw/xfree86/xaa/xaaStateChange.c
+++ b/hw/xfree86/xaa/xaaStateChange.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */
+/* $XFree86$ */
#include "misc.h"
#include "xf86.h"
diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c
index 862f50ba0..3e1c82edb 100644
--- a/hw/xfree86/xaa/xaaStipple.c
+++ b/hw/xfree86/xaa/xaaStipple.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.12 2003/08/04 22:18:31 mvojkovi Exp $ */
+/* $XFree86$ */
#include "xaa.h"
#include "xaalocal.h"
diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c
index 845dccd4e..c5b05823d 100644
--- a/hw/xfree86/xaa/xaaTEGlyph.c
+++ b/hw/xfree86/xaa/xaaTEGlyph.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.9 2000/09/01 05:49:45 mvojkovi Exp $ */
+/* $XFree86$ */
#include "xaa.h"
diff --git a/hw/xfree86/xaa/xaaTEGlyphBlt.S b/hw/xfree86/xaa/xaaTEGlyphBlt.S
index f5c580760..6b3df0027 100644
--- a/hw/xfree86/xaa/xaaTEGlyphBlt.S
+++ b/hw/xfree86/xaa/xaaTEGlyphBlt.S
@@ -21,7 +21,7 @@
*
* Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net).
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.2 1999/12/27 00:39:52 robin Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c
index 82fa28674..ef6b69c46 100644
--- a/hw/xfree86/xaa/xaaTEText.c
+++ b/hw/xfree86/xaa/xaaTEText.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */
+/* $XFree86$ */
/********************************************************************
diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c
index 0d2ce760a..1f0dd58a3 100644
--- a/hw/xfree86/xaa/xaaTables.c
+++ b/hw/xfree86/xaa/xaaTables.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.2 1998/07/25 16:58:53 dawes Exp $ */
+/* $XFree86$ */
/*
* This is a table of 24-bit values, indexed with an 8-bit byte value, then
diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c
index f999b425f..d26b0f8b9 100644
--- a/hw/xfree86/xaa/xaaWideLine.c
+++ b/hw/xfree86/xaa/xaaWideLine.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h
index 276f01672..d78e5a3ec 100644
--- a/hw/xfree86/xaa/xaacexp.h
+++ b/hw/xfree86/xaa/xaacexp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */
+/* $XFree86$ */
#include "Xarch.h"
diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h
index 4504deffd..88d56e822 100644
--- a/hw/xfree86/xaa/xaalocal.h
+++ b/hw/xfree86/xaa/xaalocal.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.37 2003/11/10 18:22:41 tsi Exp $ */
+/* $XFree86$ */
#ifndef _XAALOCAL_H
#define _XAALOCAL_H
diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h
index 8fee07533..048ed00fc 100644
--- a/hw/xfree86/xaa/xaarop.h
+++ b/hw/xfree86/xaa/xaarop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaarop.h,v 1.1 1999/03/21 07:35:31 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h
index e6963c325..3b835501d 100644
--- a/hw/xfree86/xaa/xaawrap.h
+++ b/hw/xfree86/xaa/xaawrap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.5 2000/09/20 02:05:42 keithp Exp $ */
+/* $XFree86$ */
#define XAA_SCREEN_PROLOGUE(pScreen, field)\
((pScreen)->field = \
diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h
index e72fa4316..82ccab208 100644
--- a/hw/xfree86/xf1bpp/mfbmap.h
+++ b/hw/xfree86/xf1bpp/mfbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.2 1998/07/25 16:59:24 dawes Exp $ */
+/* $XFree86$ */
#ifndef _MFBMAP_H
#define _MFBMAP_H
diff --git a/hw/xfree86/xf1bpp/mfbmap.sh b/hw/xfree86/xf1bpp/mfbmap.sh
index a8f43eceb..066a9fb40 100644
--- a/hw/xfree86/xf1bpp/mfbmap.sh
+++ b/hw/xfree86/xf1bpp/mfbmap.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.2 1998/07/25 16:59:24 dawes Exp $
+# $XFree86$
#
# This script recreates the mapping list that maps the mfb external
# symbols * to xf1bpp* (without "mfb")
diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h
index 94c029856..3e5021b45 100644
--- a/hw/xfree86/xf1bpp/mfbunmap.h
+++ b/hw/xfree86/xf1bpp/mfbunmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */
+/* $XFree86$ */
#ifdef _MFBMAP_H
#undef _MFBMAP_H
diff --git a/hw/xfree86/xf1bpp/mfbunmap.sh b/hw/xfree86/xf1bpp/mfbunmap.sh
index 6b244e68e..5328c0e4c 100644
--- a/hw/xfree86/xf1bpp/mfbunmap.sh
+++ b/hw/xfree86/xf1bpp/mfbunmap.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.2 1998/07/25 16:59:25 dawes Exp $
+# $XFree86$
#
# This script recreates a header that undoes the effect of mfbmap.h
# This should only be rerun if there have been changes in the mfb code
diff --git a/hw/xfree86/xf4bpp/NOTES b/hw/xfree86/xf4bpp/NOTES
index f9ccc95c1..5b9106052 100644
--- a/hw/xfree86/xf4bpp/NOTES
+++ b/hw/xfree86/xf4bpp/NOTES
@@ -191,4 +191,4 @@ MORE NOTES:
-$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.2 1998/07/25 16:59:26 dawes Exp $
+$XFree86$
diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h
index 3891f1e21..8e4c03576 100644
--- a/hw/xfree86/xf4bpp/OScompiler.h
+++ b/hw/xfree86/xf4bpp/OScompiler.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.4 2000/07/26 01:52:26 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c
index e9ac98dc9..fc8433919 100644
--- a/hw/xfree86/xf4bpp/emulOpStip.c
+++ b/hw/xfree86/xf4bpp/emulOpStip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c
index 42f118aac..6f2096e97 100644
--- a/hw/xfree86/xf4bpp/emulRepAre.c
+++ b/hw/xfree86/xf4bpp/emulRepAre.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c
index 650c448b8..68e85cc58 100644
--- a/hw/xfree86/xf4bpp/emulTile.c
+++ b/hw/xfree86/xf4bpp/emulTile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h
index f99ce33e0..c6faac42b 100644
--- a/hw/xfree86/xf4bpp/ibmTrace.h
+++ b/hw/xfree86/xf4bpp/ibmTrace.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.2 1998/07/25 16:59:28 dawes Exp $ */
+/* $XFree86$ */
diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c
index 300256021..801c7b304 100644
--- a/hw/xfree86/xf4bpp/mfbbres.c
+++ b/hw/xfree86/xf4bpp/mfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c
index 560995957..e4acaea5e 100644
--- a/hw/xfree86/xf4bpp/mfbbresd.c
+++ b/hw/xfree86/xf4bpp/mfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c
index 4c4d8eab6..4fefdb626 100644
--- a/hw/xfree86/xf4bpp/mfbfillarc.c
+++ b/hw/xfree86/xf4bpp/mfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c
index 3d6c3df52..1e8947669 100644
--- a/hw/xfree86/xf4bpp/mfbhrzvert.c
+++ b/hw/xfree86/xf4bpp/mfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c
index a5d5b5b37..e00d26269 100644
--- a/hw/xfree86/xf4bpp/mfbimggblt.c
+++ b/hw/xfree86/xf4bpp/mfbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c
index c2717599f..51c4d164d 100644
--- a/hw/xfree86/xf4bpp/mfbline.c
+++ b/hw/xfree86/xf4bpp/mfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c
index 7ca32d903..e7cbc16e6 100644
--- a/hw/xfree86/xf4bpp/mfbzerarc.c
+++ b/hw/xfree86/xf4bpp/mfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86$ */
/************************************************************
diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c
index 1d118863f..1d4bd8feb 100644
--- a/hw/xfree86/xf4bpp/offscreen.c
+++ b/hw/xfree86/xf4bpp/offscreen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 1993 Gerrit Jan Akkerman
*
diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c
index 40e9d5b32..83cae9e36 100644
--- a/hw/xfree86/xf4bpp/ppcArea.c
+++ b/hw/xfree86/xf4bpp/ppcArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c
index a1f49a486..200dc00fb 100644
--- a/hw/xfree86/xf4bpp/ppcBStore.c
+++ b/hw/xfree86/xf4bpp/ppcBStore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.3 1999/06/06 08:48:57 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c
index a68f5faff..de9e8e2f3 100644
--- a/hw/xfree86/xf4bpp/ppcCReduce.c
+++ b/hw/xfree86/xf4bpp/ppcCReduce.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c
index cd307fe94..f4604e9a9 100644
--- a/hw/xfree86/xf4bpp/ppcClip.c
+++ b/hw/xfree86/xf4bpp/ppcClip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.5 1999/09/25 14:38:16 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index 86b7d6f6c..5ecbb0c94 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c
index 919fa0133..a32fadfe2 100644
--- a/hw/xfree86/xf4bpp/ppcDepth.c
+++ b/hw/xfree86/xf4bpp/ppcDepth.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c
index af1ecb95e..a692e2b0e 100644
--- a/hw/xfree86/xf4bpp/ppcFillRct.c
+++ b/hw/xfree86/xf4bpp/ppcFillRct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index df8ae335f..5c194a36d 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.8 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h
index 341e17534..e1156cd5b 100644
--- a/hw/xfree86/xf4bpp/ppcGCstr.h
+++ b/hw/xfree86/xf4bpp/ppcGCstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c
index b6c404e80..f7ae995a3 100644
--- a/hw/xfree86/xf4bpp/ppcGetSp.c
+++ b/hw/xfree86/xf4bpp/ppcGetSp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.3 1999/06/06 08:48:59 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index f6999c561..8b12733b2 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1990 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c
index 275db433a..3de94c8ce 100644
--- a/hw/xfree86/xf4bpp/ppcImg.c
+++ b/hw/xfree86/xf4bpp/ppcImg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c
index c009d696e..a3041d4d9 100644
--- a/hw/xfree86/xf4bpp/ppcPixFS.c
+++ b/hw/xfree86/xf4bpp/ppcPixFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c
index 2317fbdfa..8a96671ef 100644
--- a/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c
index f52343fc9..53b29b6ce 100644
--- a/hw/xfree86/xf4bpp/ppcPntWin.c
+++ b/hw/xfree86/xf4bpp/ppcPntWin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c
index d080a623f..9ac9de298 100644
--- a/hw/xfree86/xf4bpp/ppcPolyPnt.c
+++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c
index 754eb3732..61966c83f 100644
--- a/hw/xfree86/xf4bpp/ppcPolyRec.c
+++ b/hw/xfree86/xf4bpp/ppcPolyRec.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c
index 57d5fcff8..95bcb09b0 100644
--- a/hw/xfree86/xf4bpp/ppcQuery.c
+++ b/hw/xfree86/xf4bpp/ppcQuery.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c
index 5d33bc3c9..78e61425c 100644
--- a/hw/xfree86/xf4bpp/ppcRslvC.c
+++ b/hw/xfree86/xf4bpp/ppcRslvC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.5 2001/12/17 20:00:46 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c
index 81294b2cc..9a8f113d9 100644
--- a/hw/xfree86/xf4bpp/ppcSetSp.c
+++ b/hw/xfree86/xf4bpp/ppcSetSp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h
index 7ea244f66..dfb295f81 100644
--- a/hw/xfree86/xf4bpp/ppcSpMcro.h
+++ b/hw/xfree86/xf4bpp/ppcSpMcro.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.2 1998/07/25 16:59:42 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index fc38cdcfe..be4adfc0f 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c
index 1de8d68ee..8fd419420 100644
--- a/hw/xfree86/xf4bpp/ppcWindow.c
+++ b/hw/xfree86/xf4bpp/ppcWindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c
index 660cc356b..4380cf7ab 100644
--- a/hw/xfree86/xf4bpp/vgaBitBlt.c
+++ b/hw/xfree86/xf4bpp/vgaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86$ */
/* GJA -- span move routines */
diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c
index 867e2c50e..8023f7a7e 100644
--- a/hw/xfree86/xf4bpp/vgaGC.c
+++ b/hw/xfree86/xf4bpp/vgaGC.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c
index 4357e4d8a..8f1de6344 100644
--- a/hw/xfree86/xf4bpp/vgaImages.c
+++ b/hw/xfree86/xf4bpp/vgaImages.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h
index 43f59d938..019585dad 100644
--- a/hw/xfree86/xf4bpp/vgaReg.h
+++ b/hw/xfree86/xf4bpp/vgaReg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.4 2002/01/25 21:56:22 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c
index b3711f852..6ea2d326d 100644
--- a/hw/xfree86/xf4bpp/vgaSolid.c
+++ b/hw/xfree86/xf4bpp/vgaSolid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c
index f5ace74d0..81f149da0 100644
--- a/hw/xfree86/xf4bpp/vgaStipple.c
+++ b/hw/xfree86/xf4bpp/vgaStipple.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h
index ecc2fa738..2a3f5724e 100644
--- a/hw/xfree86/xf4bpp/vgaVideo.h
+++ b/hw/xfree86/xf4bpp/vgaVideo.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.2 1998/07/25 16:59:45 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c
index 3509ce77f..784132cb4 100644
--- a/hw/xfree86/xf4bpp/wm3.c
+++ b/hw/xfree86/xf4bpp/wm3.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.4 2002/01/25 21:56:23 tsi Exp $ */
+/* $XFree86$ */
diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h
index 5fd303d7d..071b893f6 100644
--- a/hw/xfree86/xf4bpp/wm3.h
+++ b/hw/xfree86/xf4bpp/wm3.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.3 2000/09/26 15:57:21 tsi Exp $ */
+/* $XFree86$ */
diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h
index 59458a258..a44d4f627 100644
--- a/hw/xfree86/xf4bpp/xf4bpp.h
+++ b/hw/xfree86/xf4bpp/xf4bpp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */
+/* $XFree86$ */
#ifndef __XF4BPP_H__
diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h
index b7fa9fd00..eba4fc2e5 100644
--- a/hw/xfree86/xf8_16bpp/cfb8_16.h
+++ b/hw/xfree86/xf8_16bpp/cfb8_16.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.2 1999/03/28 15:33:09 dawes Exp $ */
+/* $XFree86$ */
#ifndef _CFB8_16_H
#define _CFB8_16_H
diff --git a/hw/xfree86/xf8_16bpp/cfb8_16module.c b/hw/xfree86/xf8_16bpp/cfb8_16module.c
index d0d1974e7..b2b126d95 100644
--- a/hw/xfree86/xf8_16bpp/cfb8_16module.c
+++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.1 1999/01/31 12:22:16 dawes Exp $ */
+/* $XFree86$ */
#ifdef XFree86LOADER
diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c
index 5e19fb7a2..b96b6b91f 100644
--- a/hw/xfree86/xf8_16bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c
@@ -4,7 +4,7 @@
Written by Mark Vojkovich (mvojkovi@ucsd.edu)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.8 2003/02/17 16:08:30 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c
index 757b0dc49..0a769a789 100644
--- a/hw/xfree86/xf8_16bpp/cfbwindow.c
+++ b/hw/xfree86/xf8_16bpp/cfbwindow.c
@@ -4,7 +4,7 @@
Written by Mark Vojkovich (mvojkovi@ucsd.edu)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h
index 30bc1a0fa..a2f31d759 100644
--- a/hw/xfree86/xf8_32bpp/cfb8_32.h
+++ b/hw/xfree86/xf8_32bpp/cfb8_32.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.6 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86$ */
#ifndef _CFB8_32_H
#define _CFB8_32_H
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c
index 9ed6b2018..1c62850f6 100644
--- a/hw/xfree86/xf8_32bpp/cfb8_32module.c
+++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.6 1999/01/26 05:54:20 dawes Exp $ */
+/* $XFree86$ */
#ifdef XFree86LOADER
diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c
index 581efb4f6..6b240bd2b 100644
--- a/hw/xfree86/xf8_32bpp/cfbbstore.c
+++ b/hw/xfree86/xf8_32bpp/cfbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86$ */
#define PSZ 8
#include "cfb.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c
index 53af8f7d8..0a44cdc5f 100644
--- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c
+++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c
index 248ca0869..b08288f19 100644
--- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c
+++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.1 1999/01/03 03:58:55 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c
index 6c13ca721..83e287d18 100644
--- a/hw/xfree86/xf8_32bpp/cfbgc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.4 2001/12/14 19:59:52 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
index d8a6f4608..635861bb5 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.3 2000/02/29 00:17:16 mvojkovi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c
index d01b2b5cb..6072c6010 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcunder.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c
index e737e025e..e3279d2fc 100644
--- a/hw/xfree86/xf8_32bpp/cfbimage.c
+++ b/hw/xfree86/xf8_32bpp/cfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "windowstr.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c
index 516decd6c..96c5c96dc 100644
--- a/hw/xfree86/xf8_32bpp/cfbpntwin.c
+++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c
index 7f123d36a..5b4cb8291 100644
--- a/hw/xfree86/xf8_32bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c
index c18b54399..03499fdc5 100644
--- a/hw/xfree86/xf8_32bpp/cfbwindow.c
+++ b/hw/xfree86/xf8_32bpp/cfbwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c
index 998503c21..95efb5c10 100644
--- a/hw/xfree86/xf8_32bpp/xf86overlay.c
+++ b/hw/xfree86/xf8_32bpp/xf86overlay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.9 2002/02/11 00:07:25 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (C) 1998. The XFree86 Project Inc.
diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h
index 9913c2a6c..2168054d9 100644
--- a/hw/xfree86/xf8_32wid/cfb8_32wid.h
+++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+/* $XFree86$ */
#ifndef _CFB8_32WID_H
#define _CFB8_32WID_H
diff --git a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
index 5a47b9ff5..83b6118bb 100644
--- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
+++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+/* $XFree86$ */
#ifdef XFree86LOADER
diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c
index 93c15371d..8f307034f 100644
--- a/hw/xfree86/xf8_32wid/cfbscrinit.c
+++ b/hw/xfree86/xf8_32wid/cfbscrinit.c
@@ -7,7 +7,7 @@
Mark Vojkovich's work.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c
index 0aa894176..b16266e93 100644
--- a/hw/xfree86/xf8_32wid/cfbwid.c
+++ b/hw/xfree86/xf8_32wid/cfbwid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c
index b7ac739b3..fa0003986 100644
--- a/hw/xfree86/xf8_32wid/cfbwindow.c
+++ b/hw/xfree86/xf8_32wid/cfbwindow.c
@@ -7,7 +7,7 @@
Mark Vojkovich's work.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.3 2003/11/10 18:22:43 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index 488179d01..0da0d5006 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h
index dc2ac9de0..a0c586bcb 100644
--- a/hw/xnest/Args.h
+++ b/hw/xnest/Args.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTARGC_H
#define XNESTARGS_H
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index ae5ded5e3..bcebc10cd 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h
index 0b3c22581..9ce72a946 100644
--- a/hw/xnest/Color.h
+++ b/hw/xnest/Color.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTCOLOR_H
#define XNESTCOLOR_H
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 52ba867cf..f7978b69d 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index 1a8703063..002879483 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.5 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include <X11/X.h>
diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h
index 044f8f131..63894a266 100644
--- a/hw/xnest/Display.h
+++ b/hw/xnest/Display.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.7 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTCOMMON_H
#define XNESTCOMMON_H
diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h
index 6f52b286b..7b96bdfee 100644
--- a/hw/xnest/Drawable.h
+++ b/hw/xnest/Drawable.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.3 2002/11/23 19:27:50 tsi Exp $ */
+/* $XFree86$ */
#ifndef XNESTDRAWABLE_H
#define XNESTDRAWABLE_H
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 1b7b3935f..06401b172 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#define NEED_EVENTS
diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h
index ed0fbb830..9ed211cb8 100644
--- a/hw/xnest/Events.h
+++ b/hw/xnest/Events.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTEVENTS_H
#define XNESTEVENTS_H
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index f70848854..d89c3fa74 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xatom.h"
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index 972849d9a..a1980528a 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index b43695c96..de0ff1760 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h
index 722dde470..ccdc40ebe 100644
--- a/hw/xnest/GCOps.h
+++ b/hw/xnest/GCOps.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTGCOPS_H
#define XNESTGCOPS_H
diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c
index 3db9b8596..1ffc54764 100644
--- a/hw/xnest/GetTime.c
+++ b/hw/xnest/GetTime.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
from the X Consortium.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "Xos.h"
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 693c7296b..62ad3b624 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h
index ae92352d1..9a1e809cc 100644
--- a/hw/xnest/Handlers.h
+++ b/hw/xnest/Handlers.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTHANDLERS_H
#define XNESTHANDLERS_H
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 6b3c4f19f..901c96333 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.25 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index eb9291878..6a5e5796c 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "X.h"
diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h
index 5f8dc3cb4..480231860 100644
--- a/hw/xnest/Keyboard.h
+++ b/hw/xnest/Keyboard.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTKEYBOARD_H
#define XNESTKEYBOARD_H
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index b82dfa49b..dd02c1612 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index 1af5f02ec..853a48955 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h
index 0b06e5021..27a2011b8 100644
--- a/hw/xnest/Pointer.h
+++ b/hw/xnest/Pointer.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTPOINTER_H
#define XNESTPOINTER_H
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 686884555..8c26e9ad9 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.13 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h
index 96260435b..f35a2872d 100644
--- a/hw/xnest/Screen.h
+++ b/hw/xnest/Screen.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTSCREEN_H
#define XNESTSCREEN_H
diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c
index f153b5b2c..226546484 100644
--- a/hw/xnest/TestExt.c
+++ b/hw/xnest/TestExt.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index bcf7881eb..f88e587b9 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h
index 14e0085dc..dfa74dbdc 100644
--- a/hw/xnest/Visual.h
+++ b/hw/xnest/Visual.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTVISUAL_H
#define XNESTVISUAL_H
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 14ddac082..57d920b88 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h
index 7d9426d72..2028425b8 100644
--- a/hw/xnest/XNCursor.h
+++ b/hw/xnest/XNCursor.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.3 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTCURSOR_H
#define XNESTCURSOR_H
diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h
index 34d236f3b..7fb4017bd 100644
--- a/hw/xnest/XNFont.h
+++ b/hw/xnest/XNFont.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTFONT_H
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index bbec67120..56939cceb 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTGC_H
#define XNESTGC_H
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h
index 4e4d9c40c..271890aa4 100644
--- a/hw/xnest/XNPixmap.h
+++ b/hw/xnest/XNPixmap.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTPIXMAP_H
#define XNESTPIXMAP_H
diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h
index 8b5f39115..23c0d1874 100644
--- a/hw/xnest/XNWindow.h
+++ b/hw/xnest/XNWindow.h
@@ -12,7 +12,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */
+/* $XFree86$ */
#ifndef XNESTWINDOW_H
#define XNESTWINDOW_H
diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h
index 64b09de7e..ade73833f 100644
--- a/hw/xnest/Xnest.h
+++ b/hw/xnest/Xnest.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
from the X Consortium.
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.3 2001/08/28 16:48:08 tsi Exp $ */
+/* $XFree86$ */
/*
** Machines with a 64 bit library interface and a 32 bit server require
diff --git a/hw/xnest/Xnest.man.pre b/hw/xnest/Xnest.man.pre
index 488489189..0ccd4e535 100644
--- a/hw/xnest/Xnest.man.pre
+++ b/hw/xnest/Xnest.man.pre
@@ -25,7 +25,7 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
-.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.7 2003/10/24 17:22:33 dawes Exp $
+.\" $XFree86$
.\"
.TH XNEST 1 __xorgversion__
.SH NAME
diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c
index 15282d206..798081e6e 100644
--- a/hw/xnest/os2Stub.c
+++ b/hw/xnest/os2Stub.c
@@ -26,7 +26,7 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.2 2003/11/06 03:25:46 dawes Exp $ */
+/* $XFree86$ */
/* This below implements select() for calls in xnest. It has been */
/* somewhat optimized for improved performance, but assumes a few */
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index de84a7aee..fc3b4bdf6 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -26,7 +26,7 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.13 2003/07/29 21:25:15 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "../../Xext/xf86miscproc.h"
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 3202ae8d9..30cc2371a 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.35 2003/10/08 11:13:02 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "winconfig.h"
diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man
index fe78047c4..a56c38d2b 100644
--- a/hw/xwin/XWin.man
+++ b/hw/xwin/XWin.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.7 2003/10/02 13:30:09 eich Exp $
+.\" $XFree86$
.TH XWIN 1 __vendorversion__
.SH NAME
XWin \- X Server for the Cygwin environment on Microsoft Windows
diff --git a/hw/xwin/XWin.rc b/hw/xwin/XWin.rc
index 7b5708af2..c01e03895 100644
--- a/hw/xwin/XWin.rc
+++ b/hw/xwin/XWin.rc
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.2 2003/07/29 21:25:15 dawes Exp $ */
+/* $XFree86$ */
#include "resource.h"
diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
index b67a556b5..2ca4f3462 100644
--- a/hw/xwin/ddraw.h
+++ b/hw/xwin/ddraw.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xwin/ddraw.h,v 1.4 2001/07/29 22:08:15 tsi Exp $ */
+/* $XFree86$ */
#ifndef __WINE_DDRAW_H
#define __WINE_DDRAW_H
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 6ecf5ada0..21e520c38 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -31,7 +31,7 @@
* Harold L Hunt II
* Kensuke Matsuzaki
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.38 2003/10/08 11:13:02 eich Exp $ */
+/* $XFree86$ */
#ifndef _WIN_H_
#define _WIN_H_
diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
index a27309598..136607659 100644
--- a/hw/xwin/winallpriv.c
+++ b/hw/xwin/winallpriv.c
@@ -28,7 +28,7 @@
* Authors: Keith Packard, MIT X Consortium
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.12 2002/10/31 23:04:39 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index cc057eed6..29f02e7b5 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.7 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c
index a829e8eb9..2d864321e 100644
--- a/hw/xwin/winclip.c
+++ b/hw/xwin/winclip.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h
index 8f9bae789..244d1c884 100644
--- a/hw/xwin/winclipboard.h
+++ b/hw/xwin/winclipboard.h
@@ -27,7 +27,7 @@
*
* Authors: Harold Hunt
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#ifndef _WINCLIPBOARD_H_
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index a1f7b0b6d..dc440aba8 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardinit.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86$ */
#include "winclipboard.h"
diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c
index 09ef40076..b74afd704 100644
--- a/hw/xwin/winclipboardtextconv.c
+++ b/hw/xwin/winclipboardtextconv.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardtextconv.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
#include <stdio.h>
diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c
index 06a985533..a39881b57 100644
--- a/hw/xwin/winclipboardthread.c
+++ b/hw/xwin/winclipboardthread.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardthread.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include "winclipboard.h"
diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c
index 9eb2b0d87..04bca4415 100644
--- a/hw/xwin/winclipboardunicode.c
+++ b/hw/xwin/winclipboardunicode.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardunicode.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c
index c577d060e..38843e892 100644
--- a/hw/xwin/winclipboardwndproc.c
+++ b/hw/xwin/winclipboardwndproc.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */
+/* $XFree86$ */
#include "winclipboard.h"
diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c
index 8b3a56489..cc4b8fcc4 100644
--- a/hw/xwin/winclipboardxevents.c
+++ b/hw/xwin/winclipboardxevents.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include "winclipboard.h"
diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c
index 4fb89a2fd..21832918c 100644
--- a/hw/xwin/wincmap.c
+++ b/hw/xwin/wincmap.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.10 2002/10/17 08:18:22 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index b42b1d6bf..17bc005ad 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -27,7 +27,7 @@
*
* Authors: Alexander Gottwald
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "winconfig.h"
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index d3099b373..22db4abee 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -27,7 +27,7 @@
*
* Authors: Alexander Gottwald
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.1 2002/10/17 08:18:22 alanh Exp $ */
+/* $XFree86$ */
#ifndef __WIN_CONFIG_H__
#define __WIN_CONFIG_H__
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index 336131c8a..2cf50ec51 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.7 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "shellapi.h"
diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
index e7c3ba7e7..1fdcaad6d 100644
--- a/hw/xwin/wincursor.c
+++ b/hw/xwin/wincursor.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.6 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index d905ad81c..2cf1dcfeb 100755
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/windialogs.c,v 1.1 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c
index d76e58628..821eca764 100644
--- a/hw/xwin/winengine.c
+++ b/hw/xwin/winengine.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.5 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index 8a1e0df85..a2c637052 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.6 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c
index 9ac536274..c340eebc0 100644
--- a/hw/xwin/winfillsp.c
+++ b/hw/xwin/winfillsp.c
@@ -28,7 +28,7 @@
* Authors: Harold L Hunt II
* Alan Hourihane <alanh@fairlite.demon.co.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.10 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c
index 97bd7967b..83539ced1 100644
--- a/hw/xwin/winfont.c
+++ b/hw/xwin/winfont.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.3 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c
index a4e2a53cb..95342fa73 100644
--- a/hw/xwin/wingc.c
+++ b/hw/xwin/wingc.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
void
diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c
index 49ba7f2fb..1fc3a1dd8 100644
--- a/hw/xwin/wingetsp.c
+++ b/hw/xwin/wingetsp.c
@@ -28,7 +28,7 @@
* Authors: Harold L Hunt II
* Alan Hourihane <alanh@fairlite.demon.co.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index 95f245e57..32ec42a6a 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.13 2003/07/29 21:25:17 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h
index 0822b0e5f..ffbd4dfd0 100644
--- a/hw/xwin/winkeybd.h
+++ b/hw/xwin/winkeybd.h
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.3 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86$ */
/*
* We need symbols for the scan codes of keys.
diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c
index ea8303ea9..7e14d4d0e 100644
--- a/hw/xwin/winmisc.c
+++ b/hw/xwin/winmisc.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.6 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index 8c9439bfd..4ac74e70d 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.4 2001/10/29 21:10:24 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h
index 17454487d..d548dea4e 100644
--- a/hw/xwin/winms.h
+++ b/hw/xwin/winms.h
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.2 2001/04/18 17:14:06 dawes Exp $ */
+/* $XFree86$ */
#ifndef _WINMS_H_
#define _WINMS_H_
diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c
index ce8ac4199..8d42d95a0 100644
--- a/hw/xwin/winmsg.c
+++ b/hw/xwin/winmsg.c
@@ -27,7 +27,7 @@
*
* Authors: Alexander Gottwald
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "winmsg.h"
diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h
index 16ec536b0..136cdc3a8 100644
--- a/hw/xwin/winmsg.h
+++ b/hw/xwin/winmsg.h
@@ -27,7 +27,7 @@
*
* Authors: Alexander Gottwald
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#ifndef __WIN_MSG_H__
#define __WIN_MSG_H__
diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c
index 21be64977..be65bd153 100755
--- a/hw/xwin/winmultiwindowclass.c
+++ b/hw/xwin/winmultiwindowclass.c
@@ -27,7 +27,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include <Xatom.h>
#include "propertyst.h"
diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h
index b6ad55d8b..f9cfee30f 100755
--- a/hw/xwin/winmultiwindowclass.h
+++ b/hw/xwin/winmultiwindowclass.h
@@ -27,7 +27,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
/*
diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c
index dd56db6d6..bd3d4f378 100755
--- a/hw/xwin/winmultiwindowicons.c
+++ b/hw/xwin/winmultiwindowicons.c
@@ -27,7 +27,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowicons.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "dixevents.h"
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 2d6a6f2cc..8ae6e31bb 100755
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -28,7 +28,7 @@
* Authors: Kensuke Matsuzaki
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.3 2003/12/22 01:34:20 dickey Exp $ */
+/* $XFree86$ */
#ifdef SHAPE
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 15e508659..d83891b08 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -29,7 +29,7 @@
* Earle F. Philhower, III
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "dixevents.h"
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index a60d36135..cdf2443cd 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -27,7 +27,7 @@
*
* Authors: Kensuke Matsuzaki
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v 1.3 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
/* X headers */
#include <stdio.h>
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index d90abb61f..5e032869a 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -29,7 +29,7 @@
* Earle F. Philhower, III
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.3 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "dixevents.h"
diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c
index f7d8a4a1a..219c292dd 100644
--- a/hw/xwin/winnativegdi.c
+++ b/hw/xwin/winnativegdi.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.15 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c
index 7cbdb5e53..7e00eddd5 100644
--- a/hw/xwin/winpfbdd.c
+++ b/hw/xwin/winpfbdd.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.18 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index 43ade059b..c824e53b9 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -28,7 +28,7 @@
* Authors: drewry, september 1986
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c
index d28929d67..9bfd6c547 100644
--- a/hw/xwin/winpntwin.c
+++ b/hw/xwin/winpntwin.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c
index 948c34428..22090036f 100644
--- a/hw/xwin/winpolyline.c
+++ b/hw/xwin/winpolyline.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.4 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 3bea60d3d..5965e9b45 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -27,7 +27,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.c,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index ae1cb07d8..ca69db4d0 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -27,7 +27,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.h,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
/* Need to know how long paths can be... */
#include <limits.h>
diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l
index 8eda8e6c2..364d03451 100644
--- a/hw/xwin/winprefslex.l
+++ b/hw/xwin/winprefslex.l
@@ -28,7 +28,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefslex.l,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y
index a6ffc7207..c148efba9 100644
--- a/hw/xwin/winprefsyacc.y
+++ b/hw/xwin/winprefsyacc.y
@@ -28,7 +28,7 @@
*
* Authors: Earle F. Philhower, III
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winprefsyacc.y,v 1.1 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c
index deb9629d7..0288fa55b 100644
--- a/hw/xwin/winpushpxl.c
+++ b/hw/xwin/winpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c
index b31fcf641..d714330c1 100644
--- a/hw/xwin/winregistry.c
+++ b/hw/xwin/winregistry.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winregistry.c,v 1.1 2002/07/05 09:19:26 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c
index c5ec45de5..76a997aaa 100644
--- a/hw/xwin/winrop.c
+++ b/hw/xwin/winrop.c
@@ -27,7 +27,7 @@
*
* Authors: Alan Hourihane <alanh@fairlite.demon.co.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winrop.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
/*
* Raster operations used by Windows translated to X's 16 rop codes...
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 79e985c6b..612e069b1 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -31,7 +31,7 @@
* Harold L Hunt II
* Kensuke Matsuzaki
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.28 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c
index c0340e47b..4de5bec20 100644
--- a/hw/xwin/winsetsp.c
+++ b/hw/xwin/winsetsp.c
@@ -28,7 +28,7 @@
* Authors: Harold L Hunt II
* Alan Hourihane <alanh@fairlite.demon.co.uk>
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c
index a409c27c6..795660dbd 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.24 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index e902f31b0..030a41d80 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index 16b1969d7..00fdc08df 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.23 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c
index 90c77b1c8..b82fea14c 100755
--- a/hw/xwin/wintrayicon.c
+++ b/hw/xwin/wintrayicon.c
@@ -28,7 +28,7 @@
* Authors: Early Ehlinger
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/wintrayicon.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include <shellapi.h>
diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c
index 8bf12cd66..6a93d7797 100755
--- a/hw/xwin/winvideo.c
+++ b/hw/xwin/winvideo.c
@@ -27,7 +27,7 @@
*
* Authors: Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86$ */
#include "win.h"
#include "Xv.h"
diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c
index f311d0dc9..504cb440c 100644
--- a/hw/xwin/winwakeup.c
+++ b/hw/xwin/winwakeup.c
@@ -30,7 +30,7 @@
* Peter Busch
* Harold L Hunt II
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.7 2003/07/29 21:25:18 dawes Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 76dfc5d89..0870f0dd2 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -28,7 +28,7 @@
* Authors: Harold L Hunt II
* Kensuke Matsuzaki
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.10 2003/12/22 01:34:20 dickey Exp $ */
+/* $XFree86$ */
#include "win.h"
diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
index 8153b5600..94541ab8c 100644
--- a/hw/xwin/winwindow.h
+++ b/hw/xwin/winwindow.h
@@ -27,7 +27,7 @@
*
* Authors: Kensuke Matsuzaki
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.4 2003/10/08 11:13:03 eich Exp $ */
+/* $XFree86$ */
#ifndef _WINWINDOW_H_
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index 5b47a212a..67bf8a1aa 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -31,7 +31,7 @@
* Harold L Hunt II
* MATSUZAKI Kensuke
*/
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */
+/* $XFree86$ */
#include "win.h"
#include <commctrl.h>
diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h
index cb4ee6be4..2c945c549 100644
--- a/ilbm/ilbm.h
+++ b/ilbm/ilbm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c
index b148bc00c..c9a4b2bf1 100644
--- a/ilbm/ilbmbitblt.c
+++ b/ilbm/ilbmbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c
index 455c07cb5..286a82474 100644
--- a/ilbm/ilbmblt.c
+++ b/ilbm/ilbmblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */
+/* $XFree86$ */
/*
* ilbm copy area
*/
diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c
index 4204c61b5..931da54fd 100644
--- a/ilbm/ilbmbres.c
+++ b/ilbm/ilbmbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c
index 75391e96b..1cd456bb1 100644
--- a/ilbm/ilbmbresd.c
+++ b/ilbm/ilbmbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c
index 8309e2600..2a12a39bc 100644
--- a/ilbm/ilbmbstore.c
+++ b/ilbm/ilbmbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: ilbmbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/*
diff --git a/ilbm/ilbmclip.c b/ilbm/ilbmclip.c
index 4628e61d0..72d143e18 100644
--- a/ilbm/ilbmclip.c
+++ b/ilbm/ilbmclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c
index 10dadd968..e745c4f07 100644
--- a/ilbm/ilbmcmap.c
+++ b/ilbm/ilbmcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: ilbmcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c
index f107e4692..d8cebf3ec 100644
--- a/ilbm/ilbmfillarc.c
+++ b/ilbm/ilbmfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c
index 642a95f40..e76c67d8c 100644
--- a/ilbm/ilbmfillrct.c
+++ b/ilbm/ilbmfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c
index 5564e5142..423ed2b53 100644
--- a/ilbm/ilbmfillsp.c
+++ b/ilbm/ilbmfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c
index 50cf56773..05e89bd8d 100644
--- a/ilbm/ilbmfont.c
+++ b/ilbm/ilbmfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c
index 8253d9cd4..67153e09c 100644
--- a/ilbm/ilbmgc.c
+++ b/ilbm/ilbmgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c
index 727bafd39..e6adbae4a 100644
--- a/ilbm/ilbmgetsp.c
+++ b/ilbm/ilbmgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c
index fe2638167..277ac722a 100644
--- a/ilbm/ilbmhrzvert.c
+++ b/ilbm/ilbmhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c
index d2f7a4df9..ce9a8c6fa 100644
--- a/ilbm/ilbmimage.c
+++ b/ilbm/ilbmimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86$ */
#include <stdio.h>
/* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c
index 1bd6f02f9..9aa220ff6 100644
--- a/ilbm/ilbmimggblt.c
+++ b/ilbm/ilbmimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c
index d831489c5..ac52c40bc 100644
--- a/ilbm/ilbmline.c
+++ b/ilbm/ilbmline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c
index d85346aca..9717aceca 100644
--- a/ilbm/ilbmmisc.c
+++ b/ilbm/ilbmmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c
index ab5a33f2a..01b991892 100644
--- a/ilbm/ilbmpixmap.c
+++ b/ilbm/ilbmpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c
index b76a29892..c4272047c 100644
--- a/ilbm/ilbmply1rct.c
+++ b/ilbm/ilbmply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: ilbmply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
*
diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c
index a7dca5756..99b349054 100644
--- a/ilbm/ilbmplygblt.c
+++ b/ilbm/ilbmplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c
index 0199b0bc6..497eb50ee 100644
--- a/ilbm/ilbmpntarea.c
+++ b/ilbm/ilbmpntarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c
index 5cc29e331..787955a87 100644
--- a/ilbm/ilbmpntwin.c
+++ b/ilbm/ilbmpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: ilbmpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c
index f313dc8d1..2364a3b60 100644
--- a/ilbm/ilbmpolypnt.c
+++ b/ilbm/ilbmpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c
index 6a045d242..efe5b0ace 100644
--- a/ilbm/ilbmpushpxl.c
+++ b/ilbm/ilbmpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c
index 5a6fa71a0..9690aa510 100644
--- a/ilbm/ilbmscrinit.c
+++ b/ilbm/ilbmscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c
index a18cf53f8..901b4bd7f 100644
--- a/ilbm/ilbmsetsp.c
+++ b/ilbm/ilbmsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c
index dc42baee9..c80efa8c9 100644
--- a/ilbm/ilbmtegblt.c
+++ b/ilbm/ilbmtegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86$ */
/* $XConsortium: ilbmtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmtile.c b/ilbm/ilbmtile.c
index e289144ef..d6e815405 100644
--- a/ilbm/ilbmtile.c
+++ b/ilbm/ilbmtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c
index 524972944..fbf543de4 100644
--- a/ilbm/ilbmwindow.c
+++ b/ilbm/ilbmwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: ilbmwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c
index 9bdf22155..c34a3e9e9 100644
--- a/ilbm/ilbmzerarc.c
+++ b/ilbm/ilbmzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/include/XIstubs.h b/include/XIstubs.h
index ad36bc716..6a6d671be 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/bstore.h b/include/bstore.h
index c3a6a9f38..886807cd7 100644
--- a/include/bstore.h
+++ b/include/bstore.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/
+/* $XFree86$*/
/*
* Copyright (c) 1987 by the Regents of the University of California
*
diff --git a/include/bstorestr.h b/include/bstorestr.h
index 694841ed0..734a9237f 100644
--- a/include/bstorestr.h
+++ b/include/bstorestr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/
+/* $XFree86$*/
/*
* Copyright (c) 1987 by the Regents of the University of California
*
diff --git a/include/closestr.h b/include/closestr.h
index 34d5931f2..2d12b130c 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86$ */
#ifndef CLOSESTR_H
diff --git a/include/colormap.h b/include/colormap.h
index f249f4f03..6964b24af 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/*
Copyright 1987, 1998 The Open Group
diff --git a/include/cursor.h b/include/cursor.h
index 7509a94af..9ca9f81de 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/cursorstr.h b/include/cursorstr.h
index 0e2f04a6d..f305d5c5a 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */
+/* $XFree86$ */
#ifndef CURSORSTRUCT_H
#define CURSORSTRUCT_H
diff --git a/include/dix.h b/include/dix.h
index a47bfd8cc..11490941b 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/dixevents.h b/include/dixevents.h
index f80f3ab0b..ad5953d37 100644
--- a/include/dixevents.h
+++ b/include/dixevents.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixfont.h b/include/dixfont.h
index 2a6877de2..f58e95d06 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */
+/* $XFree86$ */
#ifndef DIXFONT_H
#define DIXFONT_H 1
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 21992e786..3844934f2 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 43920540f..d308671f7 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/include/exevents.h b/include/exevents.h
index ea3804bd3..edd260c5d 100644
--- a/include/exevents.h
+++ b/include/exevents.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extension.h b/include/extension.h
index 6b674f07f..6c405abb4 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
#ifndef EXTENSION_H
#define EXTENSION_H
diff --git a/include/extinit.h b/include/extinit.h
index 107eee891..9eb417192 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 0d7debe0b..27cee9a5a 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86$ */
#ifndef EXTENSIONSTRUCT_H
#define EXTENSIONSTRUCT_H
diff --git a/include/gc.h b/include/gc.h
index a886d77b8..6d099e6b8 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 43cc679b4..9b582504b 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -47,7 +47,7 @@ SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86$ */
#ifndef GCSTRUCT_H
#define GCSTRUCT_H
diff --git a/include/globals.h b/include/globals.h
index 3b1b6ba0b..3c0cb73f4 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */
+/* $XFree86$ */
#ifndef _XSERV_GLOBAL_H_
#define _XSERV_GLOBAL_H_
diff --git a/include/input.h b/include/input.h
index acf3bca1a..ae9ab6c9d 100644
--- a/include/input.h
+++ b/include/input.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
#ifndef INPUT_H
#define INPUT_H
diff --git a/include/inputstr.h b/include/inputstr.h
index a8a834807..5fda190e3 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/misc.h b/include/misc.h
index ffa65b31e..4a264a119 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 86f114792..40e3fd058 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86$ */
#ifndef MISCSTRUCT_H
#define MISCSTRUCT_H 1
diff --git a/include/opaque.h b/include/opaque.h
index b5a55a60b..634f81380 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */
+/* $XFree86$ */
#ifndef OPAQUE_H
#define OPAQUE_H
diff --git a/include/os.h b/include/os.h
index e9328c8fa..65a17eb56 100644
--- a/include/os.h
+++ b/include/os.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/pixmap.h b/include/pixmap.h
index 56bb675ae..6cea329ec 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
#ifndef PIXMAP_H
#define PIXMAP_H
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index d5bc21273..1b0df9fd3 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */
+/* $XFree86$ */
#ifndef PIXMAPSTRUCT_H
#define PIXMAPSTRUCT_H
diff --git a/include/property.h b/include/property.h
index 66103bc8e..c813992a8 100644
--- a/include/property.h
+++ b/include/property.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */
+/* $XFree86$ */
#ifndef PROPERTY_H
#define PROPERTY_H
diff --git a/include/propertyst.h b/include/propertyst.h
index 5c335d038..b0d71b095 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */
+/* $XFree86$ */
#ifndef PROPERTYSTRUCT_H
#define PROPERTYSTRUCT_H
diff --git a/include/regionstr.h b/include/regionstr.h
index 29fcfbac4..c8c3c818d 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
+/* $XFree86$ */
#ifndef REGIONSTRUCT_H
#define REGIONSTRUCT_H
diff --git a/include/resource.h b/include/resource.h
index 6517ab212..f8499a2ea 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86$ */
#ifndef RESOURCE_H
#define RESOURCE_H 1
diff --git a/include/screenint.h b/include/screenint.h
index 988a7416c..f0453e477 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86$ */
#ifndef SCREENINT_H
#define SCREENINT_H
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 0f1813c00..6a79621ef 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */
+/* $XFree86$ */
#ifndef SCREENINTSTRUCT_H
#define SCREENINTSTRUCT_H
diff --git a/include/servermd.h b/include/servermd.h
index 654e1411b..27d403fad 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/include/site.h b/include/site.h
index 1c272fc3f..26b2bd16b 100644
--- a/include/site.h
+++ b/include/site.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */
+/* $XFree86$ */
#ifndef SITE_H
#define SITE_H
diff --git a/include/swaprep.h b/include/swaprep.h
index b6671e7d9..7aa747dc4 100644
--- a/include/swaprep.h
+++ b/include/swaprep.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/swapreq.h b/include/swapreq.h
index 59ba8c5be..9f1a1357f 100644
--- a/include/swapreq.h
+++ b/include/swapreq.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/include/validate.h b/include/validate.h
index 2a13962a7..5b1dc7b86 100644
--- a/include/validate.h
+++ b/include/validate.h
@@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */
+/* $XFree86$ */
#ifndef VALIDATE_H
#define VALIDATE_H
diff --git a/include/window.h b/include/window.h
index 0c886559e..5056512b8 100644
--- a/include/window.h
+++ b/include/window.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
#ifndef WINDOW_H
#define WINDOW_H
diff --git a/include/windowstr.h b/include/windowstr.h
index 2dce443d3..99a3716e7 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */
+/* $XFree86$ */
#ifndef WINDOWSTRUCT_H
#define WINDOWSTRUCT_H
diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h
index bdc1682f5..82c637ad5 100644
--- a/iplan2p4/ipl.h
+++ b/iplan2p4/ipl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.6 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: ipl.h,v 5.37 94/04/17 20:28:38 dpw Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c
index 57b8fce57..11e358944 100644
--- a/iplan2p4/iplallpriv.c
+++ b/iplan2p4/iplallpriv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.0 1996/08/18 01:54:33 dawes Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: iplallpriv.c,v 1.5 94/04/17 20:28:42 dpw Exp $
*
diff --git a/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c
index 27470382b..ce8cdd3ba 100644
--- a/iplan2p4/iplbitblt.c
+++ b/iplan2p4/iplbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.2 2003/11/10 18:22:45 tsi Exp $ */
+/* $XFree86$ */
/*
* ipl copy area
*/
diff --git a/iplan2p4/iplblt.c b/iplan2p4/iplblt.c
index 8a48bd9da..f303859cd 100644
--- a/iplan2p4/iplblt.c
+++ b/iplan2p4/iplblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.0 1996/08/18 01:54:35 dawes Exp $ */
+/* $XFree86$ */
/*
* ipl copy area
*/
diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c
index 9d2b571db..47b895ea4 100644
--- a/iplan2p4/iplbres.c
+++ b/iplan2p4/iplbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.0 1996/08/18 01:54:36 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c
index 7cc93e90c..dd096dfbd 100644
--- a/iplan2p4/iplbresd.c
+++ b/iplan2p4/iplbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.0 1996/08/18 01:54:38 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c
index 5719ca308..422d10291 100644
--- a/iplan2p4/iplbstore.c
+++ b/iplan2p4/iplbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.0 1996/08/18 01:54:39 dawes Exp $ */
+/* $XFree86$ */
/*-
* iplbstore.c --
diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c
index 21abfdbb3..bc3bf41b1 100644
--- a/iplan2p4/iplcmap.c
+++ b/iplan2p4/iplcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.1 1998/11/22 10:37:41 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: iplcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c
index c77db6b63..50e4a81ab 100644
--- a/iplan2p4/iplfillarc.c
+++ b/iplan2p4/iplfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.0 1996/08/18 01:54:41 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c
index 512c48048..d7f32a359 100644
--- a/iplan2p4/iplfillrct.c
+++ b/iplan2p4/iplfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */
+/* $XFree86$ */
/*
* Fill rectangles.
*/
diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c
index 010f911f6..767db30cb 100644
--- a/iplan2p4/iplfillsp.c
+++ b/iplan2p4/iplfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.0 1996/08/18 01:54:43 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c
index 794a62609..8f1d01738 100644
--- a/iplan2p4/iplgc.c
+++ b/iplan2p4/iplgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c
index 271656bda..8ae61b6cc 100644
--- a/iplan2p4/iplgetsp.c
+++ b/iplan2p4/iplgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.0 1996/08/18 01:54:47 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: iplgetsp.c,v 5.14 94/04/17 20:28:50 dpw Exp $ */
/***********************************************************
diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c
index 6374e4d19..1bcb57d57 100644
--- a/iplan2p4/iplhrzvert.c
+++ b/iplan2p4/iplhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.0 1996/08/18 01:54:48 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c
index 0522309b4..6c8e9ab73 100644
--- a/iplan2p4/iplimage.c
+++ b/iplan2p4/iplimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.0 1996/08/18 01:54:49 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c
index 479bfb00a..26b036a6f 100644
--- a/iplan2p4/iplline.c
+++ b/iplan2p4/iplline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h
index 2e0a2b3cc..e95c822ef 100644
--- a/iplan2p4/iplmap.h
+++ b/iplan2p4/iplmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.2 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: iplmap.h,v 1.9 94/04/17 20:28:54 dpw Exp $
*
diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h
index fa537d3a7..4b74bf38c 100644
--- a/iplan2p4/iplmergerop.h
+++ b/iplan2p4/iplmergerop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86$ */
#ifndef _IPLANMERGEROP_H_
#define _IPLANMERGEROP_H_
diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c
index 9f1d37dfb..d408b804e 100644
--- a/iplan2p4/iplmskbits.c
+++ b/iplan2p4/iplmskbits.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.c,v 3.0 1996/08/18 01:54:54 dawes Exp $ */
+/* $XFree86$ */
/* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
interleaved planes */
#include "iplmap.h"
diff --git a/iplan2p4/iplmskbits.h b/iplan2p4/iplmskbits.h
index 4fb3fe066..51bb26393 100644
--- a/iplan2p4/iplmskbits.h
+++ b/iplan2p4/iplmskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.h,v 3.0 1996/08/18 01:54:55 dawes Exp $ */
+/* $XFree86$ */
/* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
interleaved planes */
diff --git a/iplan2p4/iplpack.c b/iplan2p4/iplpack.c
index 96072895c..a6ca6f12b 100644
--- a/iplan2p4/iplpack.c
+++ b/iplan2p4/iplpack.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.c,v 3.0 1996/08/18 01:54:56 dawes Exp $ */
+/* $XFree86$ */
/* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
interleaved planes */
diff --git a/iplan2p4/iplpack.h b/iplan2p4/iplpack.h
index 9545c75ec..53c2c988f 100644
--- a/iplan2p4/iplpack.h
+++ b/iplan2p4/iplpack.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.h,v 3.0 1996/08/18 01:54:57 dawes Exp $ */
+/* $XFree86$ */
/* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
interleaved planes */
diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c
index 212f94979..12904fecb 100644
--- a/iplan2p4/iplpixmap.c
+++ b/iplan2p4/iplpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.1 2001/12/17 20:00:46 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: iplpixmap.c,v 5.14 94/04/17 20:28:56 dpw Exp $ */
/***********************************************************
diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c
index f73bc8864..28163e832 100644
--- a/iplan2p4/iplply1rct.c
+++ b/iplan2p4/iplply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: iplply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp $
*
diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c
index a5a61194a..88dbad6bf 100644
--- a/iplan2p4/iplpntwin.c
+++ b/iplan2p4/iplpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.0 1996/08/18 01:55:01 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: iplpntwin.c,v 5.18 94/04/17 20:28:57 dpw Exp $ */
/***********************************************************
diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c
index 3d90edea4..2d3d90324 100644
--- a/iplan2p4/iplpolypnt.c
+++ b/iplan2p4/iplpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c
index cfc43c130..75ec557ee 100644
--- a/iplan2p4/iplrrop.c
+++ b/iplan2p4/iplrrop.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.0 1996/08/18 01:55:03 dawes Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: iplrrop.c,v 1.8 94/04/17 20:28:59 dpw Exp $
*
diff --git a/iplan2p4/iplrrop.h b/iplan2p4/iplrrop.h
index d14d1a54b..13c234a58 100644
--- a/iplan2p4/iplrrop.h
+++ b/iplan2p4/iplrrop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */
+/* $XFree86$ */
/* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with
interleaved planes */
diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c
index 1d7915776..457f32a7b 100644
--- a/iplan2p4/iplscrinit.c
+++ b/iplan2p4/iplscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.3 1998/11/22 10:37:41 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c
index 0533eed71..52eefc31d 100644
--- a/iplan2p4/iplsetsp.c
+++ b/iplan2p4/iplsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.0 1996/08/18 01:55:07 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: iplsetsp.c,v 5.10 94/04/17 20:29:01 dpw Exp $ */
/***********************************************************
diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c
index 2f741ed7f..c91f6eb9a 100644
--- a/iplan2p4/iplsolid.c
+++ b/iplan2p4/iplsolid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86$ */
/*
* $XConsortium: iplsolid.c,v 1.9 94/04/17 20:29:02 dpw Exp $
*
diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c
index 4d82a655a..8414bc7b2 100644
--- a/iplan2p4/ipltegblt.c
+++ b/iplan2p4/ipltegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.0 1996/08/18 01:55:09 dawes Exp $ */
+/* $XFree86$ */
/* $XConsortium: ipltegblt.c,v 5.9 94/04/17 20:29:03 dpw Exp $ */
/***********************************************************
diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c
index ea608effb..eb2432500 100644
--- a/iplan2p4/ipltile32.c
+++ b/iplan2p4/ipltile32.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */
+/* $XFree86$ */
/*
* Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow.
* no depth dependencies.
diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c
index a63ce5da6..abd4a3021 100644
--- a/iplan2p4/ipltileodd.c
+++ b/iplan2p4/ipltileodd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.0 1996/08/18 01:55:11 dawes Exp $ */
+/* $XFree86$ */
/*
* Fill odd tiled rectangles and spans.
* no depth dependencies.
diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c
index 39d1eff9b..2b4b6ae67 100644
--- a/iplan2p4/iplwindow.c
+++ b/iplan2p4/iplwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.1 2003/11/10 18:22:45 tsi Exp $ */
+/* $XFree86$ */
/* $XConsortium: iplwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */
/***********************************************************
diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c
index 25ef34426..b0a65f03a 100644
--- a/lbx/lbxcmap.c
+++ b/lbx/lbxcmap.c
@@ -25,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
#define NEED_REPLIES
diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c
index 5a40614f6..acdbbc286 100644
--- a/lbx/lbxdix.c
+++ b/lbx/lbxdix.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */
+/* $XFree86$ */
/* various bits of DIX-level mangling */
diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c
index d611a7f2c..cdbc6519a 100644
--- a/lbx/lbxexts.c
+++ b/lbx/lbxexts.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xproto.h"
diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c
index 6eb7af197..d957e8fb4 100644
--- a/lbx/lbxgfx.c
+++ b/lbx/lbxgfx.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */
+/* $XFree86$ */
/* various bits of DIX-level mangling */
diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c
index 1a82ce3b3..437b90df0 100644
--- a/lbx/lbxmain.c
+++ b/lbx/lbxmain.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
#define NEED_REPLIES
diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c
index 461f0d778..9a475fc80 100644
--- a/lbx/lbxopts.c
+++ b/lbx/lbxopts.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */
+/* $XFree86$ */
#ifdef OPTDEBUG
#include <stdio.h>
diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c
index e9a6d8a8e..a6327744d 100644
--- a/lbx/lbxprop.c
+++ b/lbx/lbxprop.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86$ */
/* various bits of DIX-level mangling */
diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h
index 40a2ff0ae..88f32ce78 100644
--- a/lbx/lbxserve.h
+++ b/lbx/lbxserve.h
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LBXSERVE_H_
diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c
index d71647091..19b75b774 100644
--- a/lbx/lbxsquish.c
+++ b/lbx/lbxsquish.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
#include "X.h"
diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h
index eeb94f266..223201f66 100644
--- a/lbx/lbxsrvopts.h
+++ b/lbx/lbxsrvopts.h
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LBX_SRVOPTS_H_
#define _LBX_SRVOPTS_H_
diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c
index edfc0bea7..418e5bc0e 100644
--- a/lbx/lbxswap.c
+++ b/lbx/lbxswap.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
#define NEED_REPLIES
diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c
index e071846e3..87d05e1cf 100644
--- a/lbx/lbxtables.c
+++ b/lbx/lbxtables.c
@@ -21,7 +21,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
+/* $XFree86$ */
#include "dix.h"
extern int ProcInitialConnection(ClientPtr client);
diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c
index 5b1d65a4a..3b9687c2f 100644
--- a/lbx/lbxtags.c
+++ b/lbx/lbxtags.c
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "misc.h"
diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h
index e451ad091..879fabec0 100644
--- a/lbx/lbxtags.h
+++ b/lbx/lbxtags.h
@@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */
+/* $XFree86$ */
#ifndef _LBXTAGS_H_
#define _LBXTAGS_H_
diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c
index 50b424708..9a63c1179 100644
--- a/lbx/lbxzerorep.c
+++ b/lbx/lbxzerorep.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */
+/* $XFree86$ */
/*
* This module handles zeroing out unused pad bytes in core X replies.
diff --git a/mfb/fastblt.h b/mfb/fastblt.h
index f647eb6ba..253f03535 100644
--- a/mfb/fastblt.h
+++ b/mfb/fastblt.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.5 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86$ */
/*
* Fast bitblt macros for certain hardware. If your machine has an addressing
diff --git a/mfb/maskbits.c b/mfb/maskbits.c
index 4f3e0087b..bd55ed7bb 100644
--- a/mfb/maskbits.c
+++ b/mfb/maskbits.c
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.6 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86$ */
#include "maskbits.h"
#include "servermd.h"
diff --git a/mfb/maskbits.h b/mfb/maskbits.h
index 711731660..c1f700a1d 100644
--- a/mfb/maskbits.h
+++ b/mfb/maskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.9 2003/02/18 21:30:00 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/mfb/mergerop.h b/mfb/mergerop.h
index ee3a33fe9..df829e64d 100644
--- a/mfb/mergerop.h
+++ b/mfb/mergerop.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */
+/* $XFree86$ */
#ifndef _MERGEROP_H_
#define _MERGEROP_H_
diff --git a/mfb/mfb.h b/mfb/mfb.h
index 01e09f195..951240b25 100644
--- a/mfb/mfb.h
+++ b/mfb/mfb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.22 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 310d492f8..7a4232b1a 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.8 2003/11/10 18:22:45 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c
index 59968110b..a803d1f7b 100644
--- a/mfb/mfbblt.c
+++ b/mfb/mfbblt.c
@@ -1,7 +1,7 @@
/*
* mfb copy area
*/
-/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.4 2001/12/14 20:00:04 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c
index d43bd2e00..ffb354155 100644
--- a/mfb/mfbbres.c
+++ b/mfb/mfbbres.c
@@ -1,5 +1,5 @@
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
-/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c
index 182744d6e..906d24e87 100644
--- a/mfb/mfbbresd.c
+++ b/mfb/mfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c
index d23071cd3..e88bc3d81 100644
--- a/mfb/mfbclip.c
+++ b/mfb/mfbclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c
index d5dfbf47f..a0a9e5498 100644
--- a/mfb/mfbcmap.c
+++ b/mfb/mfbcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c
index 886c2852a..15c759aa4 100644
--- a/mfb/mfbfillarc.c
+++ b/mfb/mfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c
index cd1b66845..90d19b6f1 100644
--- a/mfb/mfbfillrct.c
+++ b/mfb/mfbfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.6 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c
index 5a095757f..8c573ec5e 100644
--- a/mfb/mfbfillsp.c
+++ b/mfb/mfbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.9 2001/12/14 20:00:06 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c
index 1119f66f9..f276c8d1a 100644
--- a/mfb/mfbgc.c
+++ b/mfb/mfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c
index 59bd7e538..a6f352ec6 100644
--- a/mfb/mfbgetsp.c
+++ b/mfb/mfbgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c
index 237e337f5..d68819428 100644
--- a/mfb/mfbhrzvert.c
+++ b/mfb/mfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.5 2001/12/14 20:00:08 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c
index 4d616ed8b..50c7fad37 100644
--- a/mfb/mfbimage.c
+++ b/mfb/mfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c
index 066ca3ce7..33f94fb2a 100644
--- a/mfb/mfbimggblt.c
+++ b/mfb/mfbimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbline.c b/mfb/mfbline.c
index e7e678983..23da1c769 100644
--- a/mfb/mfbline.c
+++ b/mfb/mfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c
index 980e57246..48c505b40 100644
--- a/mfb/mfbply1rct.c
+++ b/mfb/mfbply1rct.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.8 2002/12/09 04:10:57 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c
index 61a7297f0..337310de5 100644
--- a/mfb/mfbplygblt.c
+++ b/mfb/mfbplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c
index 38cd4aee8..761b95f39 100644
--- a/mfb/mfbpolypnt.c
+++ b/mfb/mfbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.5 2001/12/14 20:00:11 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c
index f10e39046..0faa37c57 100644
--- a/mfb/mfbpushpxl.c
+++ b/mfb/mfbpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c
index 28b0c24c3..8c6e17afb 100644
--- a/mfb/mfbscrclse.c
+++ b/mfb/mfbscrclse.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
#include "mfb.h"
#include "scrnintstr.h"
diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
index d07aadb80..326b69b4c 100644
--- a/mfb/mfbscrinit.c
+++ b/mfb/mfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.9 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c
index a56935dbe..1db5842fd 100644
--- a/mfb/mfbsetsp.c
+++ b/mfb/mfbsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c
index 1e0da0f02..aed7438d2 100644
--- a/mfb/mfbtegblt.c
+++ b/mfb/mfbtegblt.c
@@ -47,7 +47,7 @@ SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.8 2001/12/14 20:00:12 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "Xmd.h"
diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c
index e672f38c9..f17feafb0 100644
--- a/mfb/mfbtile.c
+++ b/mfb/mfbtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86$ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c
index f7ff963c4..294083f78 100644
--- a/mfb/mfbwindow.c
+++ b/mfb/mfbwindow.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c
index 1ef9f1f56..bccd43d08 100644
--- a/mfb/mfbzerarc.c
+++ b/mfb/mfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/cbrt.c b/mi/cbrt.c
index 44c836e43..8c645ae8b 100644
--- a/mi/cbrt.c
+++ b/mi/cbrt.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.4 2001/12/14 20:00:19 dawes Exp $ */
+/* $XFree86$ */
/* simple cbrt, in case your math library doesn't have a good one */
diff --git a/mi/mi.h b/mi/mi.h
index fba57567d..1227abb43 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */
+/* $XFree86$ */
#ifndef MI_H
#define MI_H
diff --git a/mi/miarc.c b/mi/miarc.c
index 160119563..8d01f3338 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mibank.c b/mi/mibank.c
index 11708434c..ca20c085f 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -44,7 +44,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.16 2004/01/05 16:42:10 tsi Exp $ */
+/* $XFree86$ */
/*
* This thing originated from an idea of Edwin Goei and his bank switching
diff --git a/mi/mibank.h b/mi/mibank.h
index eac53db20..bf6570be8 100644
--- a/mi/mibank.h
+++ b/mi/mibank.h
@@ -20,7 +20,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.11 2004/01/05 16:42:10 tsi Exp $ */
+/* $XFree86$ */
#ifndef __MIBANK_H__
#define __MIBANK_H__ 1
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index f0228212c..6be4b1b40 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.11 2001/12/14 20:00:20 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mibstore.c b/mi/mibstore.c
index e04e5410c..c263ee5eb 100644
--- a/mi/mibstore.c
+++ b/mi/mibstore.c
@@ -42,7 +42,7 @@ implied warranty.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.11 2003/11/10 18:22:47 tsi Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "X.h"
diff --git a/mi/mibstore.h b/mi/mibstore.h
index e8f197dbc..31acab268 100644
--- a/mi/mibstore.h
+++ b/mi/mibstore.h
@@ -16,7 +16,7 @@
*/
-/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.5 2001/08/06 20:51:18 dawes Exp $ */
+/* $XFree86$ */
#ifndef _MIBSTORE_H
#define _MIBSTORE_H
diff --git a/mi/mibstorest.h b/mi/mibstorest.h
index 249b4d4d3..0fe298dcf 100644
--- a/mi/mibstorest.h
+++ b/mi/mibstorest.h
@@ -31,7 +31,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.5 2001/12/14 20:00:21 dawes Exp $ */
+/* $XFree86$ */
#include "mibstore.h"
#include "regionstr.h"
diff --git a/mi/miclipn.c b/mi/miclipn.c
index 95272c176..17da018b7 100644
--- a/mi/miclipn.c
+++ b/mi/miclipn.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "windowstr.h"
diff --git a/mi/micmap.c b/mi/micmap.c
index b3e925a09..b08a34347 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.11 2001/05/29 22:24:06 dawes Exp $ */
+/* $XFree86$ */
/*
* This is based on cfbcmap.c. The functions here are useful independently
diff --git a/mi/micmap.h b/mi/micmap.h
index 557ae63d5..821d8f90b 100644
--- a/mi/micmap.h
+++ b/mi/micmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.7 2000/09/20 00:09:15 keithp Exp $ */
+/* $XFree86$ */
#include "colormapst.h"
diff --git a/mi/micursor.c b/mi/micursor.c
index 4c95d2f49..5ce9a2cc9 100644
--- a/mi/micursor.c
+++ b/mi/micursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.3 2001/12/14 20:00:21 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/midash.c b/mi/midash.c
index bc33b0c20..95885a17f 100644
--- a/mi/midash.c
+++ b/mi/midash.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.5 2003/07/16 01:38:56 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/midispcur.c b/mi/midispcur.c
index ca85fc3d1..9b6a382f8 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.10 2003/03/06 05:52:58 mvojkovi Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
# include "X.h"
diff --git a/mi/mieq.c b/mi/mieq.c
index 699d4130c..86df5541b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86$ */
/*
* mieq.c
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 07efa754c..2bae47971 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mifillarc.c b/mi/mifillarc.c
index fa37d45be..81b3074e4 100644
--- a/mi/mifillarc.c
+++ b/mi/mifillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.8 2003/07/16 01:38:56 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/mifillarc.h b/mi/mifillarc.h
index ed8503f15..8f64ab163 100644
--- a/mi/mifillarc.h
+++ b/mi/mifillarc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.7 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
index be2c58dfe..fed29f5f2 100644
--- a/mi/mifillrct.c
+++ b/mi/mifillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mifpoly.h b/mi/mifpoly.h
index 837cf7b20..6d45e40a7 100644
--- a/mi/mifpoly.h
+++ b/mi/mifpoly.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.4 2001/12/14 20:00:22 dawes Exp $ */
+/* $XFree86$ */
#ifndef __MIFPOLY_H__
#define __MIFPOLY_H__
diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c
index 93999ea7d..353dbceb9 100644
--- a/mi/mifpolycon.c
+++ b/mi/mifpolycon.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.3 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/migc.c b/mi/migc.c
index 29eec9749..7c4958b4c 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -27,7 +27,7 @@ from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.9 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86$ */
#include "scrnintstr.h"
#include "gcstruct.h"
diff --git a/mi/migc.h b/mi/migc.h
index 8cb5a56c9..4bad78a00 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -27,7 +27,7 @@ from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.8 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86$ */
extern void miChangeGC(
GCPtr /*pGC*/,
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 3e7e5da1b..5aec9536d 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.6 2001/12/14 20:00:23 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/miinitext.c b/mi/miinitext.c
index ee63aa41b..f25226f06 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/miline.h b/mi/miline.h
index 8977550b3..d56996c58 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.7 2001/12/14 20:00:24 dawes Exp $ */
+/* $XFree86$ */
#ifndef MILINE_H
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index cdb2058b1..68e0295f3 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.16 2003/11/10 18:22:49 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "scrnintstr.h"
diff --git a/mi/mioverlay.h b/mi/mioverlay.h
index 6098f9c39..8b9003575 100644
--- a/mi/mioverlay.h
+++ b/mi/mioverlay.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.4 2001/04/14 21:15:26 mvojkovi Exp $ */
+/* $XFree86$ */
#ifndef __MIOVERLAY_H
#define __MIOVERLAY_H
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 58d93b80b..10cc8d9b2 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -28,7 +28,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.10 2001/12/14 20:00:24 dawes Exp $ */
+/* $XFree86$ */
# define NEED_EVENTS
# include "X.h"
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 0486fc5a3..443d9a720 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.9 2001/12/14 20:00:24 dawes Exp $ */
+/* $XFree86$ */
#ifndef MIPOINTER_H
#define MIPOINTER_H
diff --git a/mi/mipointrst.h b/mi/mipointrst.h
index ab5372229..e2d0ed4a4 100644
--- a/mi/mipointrst.h
+++ b/mi/mipointrst.h
@@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.4 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86$ */
#include "mipointer.h"
#include "scrnintstr.h"
diff --git a/mi/mipoly.c b/mi/mipoly.c
index ad69d7062..2c420b250 100644
--- a/mi/mipoly.c
+++ b/mi/mipoly.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.3 2003/07/16 01:38:56 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipoly.h b/mi/mipoly.h
index 42d973477..db23f7663 100644
--- a/mi/mipoly.h
+++ b/mi/mipoly.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/mi/mipolycon.c b/mi/mipolycon.c
index d99ed83d7..fdc5a66a8 100644
--- a/mi/mipolycon.c
+++ b/mi/mipolycon.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.4 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipolygen.c b/mi/mipolygen.c
index bbeb05dc3..b25292d23 100644
--- a/mi/mipolygen.c
+++ b/mi/mipolygen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c
index ed19f5f68..66908bcf8 100644
--- a/mi/mipolypnt.c
+++ b/mi/mipolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index 298ba2385..2c121dcb2 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c
index cb6bb7550..17440c51e 100644
--- a/mi/mipolyseg.c
+++ b/mi/mipolyseg.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipolytext.c b/mi/mipolytext.c
index 9084fe180..ecdc3dc02 100644
--- a/mi/mipolytext.c
+++ b/mi/mipolytext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */
+/* $XFree86$ */
/*******************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c
index 7ffeadd86..37e6a0a67 100644
--- a/mi/mipolyutil.c
+++ b/mi/mipolyutil.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c
index 0c8d32ae6..38d7dd2dd 100644
--- a/mi/mipushpxl.c
+++ b/mi/mipushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/miregion.c b/mi/miregion.c
index ef666c321..f2a268365 100644
--- a/mi/miregion.c
+++ b/mi/miregion.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1988, 1989, 1998 The Open Group
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index edb5f7d78..e14ab35dc 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.16 2003/04/23 21:51:53 tsi Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "servermd.h"
diff --git a/mi/mispans.c b/mi/mispans.c
index 81fa45da7..66266e415 100644
--- a/mi/mispans.c
+++ b/mi/mispans.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.4 2001/12/14 20:00:26 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/mispans.h b/mi/mispans.h
index 5ae2d014a..c89cce31a 100644
--- a/mi/mispans.h
+++ b/mi/mispans.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.3 2001/12/14 20:00:26 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/misprite.c b/mi/misprite.c
index d323f1168..c5f8b368f 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.11 2002/12/09 04:10:58 tsi Exp $ */
+/* $XFree86$ */
# include "X.h"
# include "Xproto.h"
diff --git a/mi/misprite.h b/mi/misprite.h
index a7e19f7cb..e4dcfe042 100644
--- a/mi/misprite.h
+++ b/mi/misprite.h
@@ -32,7 +32,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.3 2001/12/14 20:00:27 dawes Exp $ */
+/* $XFree86$ */
typedef struct {
Bool (*RealizeCursor)(
diff --git a/mi/mispritest.h b/mi/mispritest.h
index eddc16c2d..5c2b6d146 100644
--- a/mi/mispritest.h
+++ b/mi/mispritest.h
@@ -30,7 +30,7 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.5 2001/12/14 20:00:27 dawes Exp $ */
+/* $XFree86$ */
# include "misprite.h"
#ifdef RENDER
diff --git a/mi/mistruct.h b/mi/mistruct.h
index 0744b2593..98879b72d 100644
--- a/mi/mistruct.h
+++ b/mi/mistruct.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
#ifndef MISTRUCT_H
#define MISTRUCT_H
diff --git a/mi/mivalidate.h b/mi/mivalidate.h
index c1ef15bb1..c25e5d5bc 100644
--- a/mi/mivalidate.h
+++ b/mi/mivalidate.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
#ifndef MIVALIDATE_H
diff --git a/mi/mivaltree.c b/mi/mivaltree.c
index 90ba5d98e..bd5c1afc9 100644
--- a/mi/mivaltree.c
+++ b/mi/mivaltree.c
@@ -73,7 +73,7 @@ in this Software without prior written authorization from The Open Group.
* *
*****************************************************************/
-/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */
+/* $XFree86$ */
/*
* Aug '86: Susan Angebranndt -- original code
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 84b4346f2..44ad3974b 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.13 2003/07/16 01:38:57 dawes Exp $ */
+/* $XFree86$ */
/* Author: Keith Packard, MIT X Consortium */
diff --git a/mi/miwideline.h b/mi/miwideline.h
index f32a1e8fe..5071e05df 100644
--- a/mi/miwideline.h
+++ b/mi/miwideline.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.12 2001/12/14 20:00:28 dawes Exp $ */
+/* $XFree86$ */
/* Author: Keith Packard, MIT X Consortium */
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 9c962ee4e..440703ff4 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mizerarc.c b/mi/mizerarc.c
index e2233e78e..debdf0ac9 100644
--- a/mi/mizerarc.c
+++ b/mi/mizerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.7 2003/07/16 01:38:59 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/mizerarc.h b/mi/mizerarc.h
index 4a52efa29..a5670838c 100644
--- a/mi/mizerarc.h
+++ b/mi/mizerarc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.3 2001/12/14 20:00:28 dawes Exp $ */
+/* $XFree86$ */
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/mi/mizerclip.c b/mi/mizerclip.c
index fa1863b54..f671218a2 100644
--- a/mi/mizerclip.c
+++ b/mi/mizerclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.3 2001/12/14 20:00:29 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/mi/mizerline.c b/mi/mizerline.c
index d1fbf631e..edf9418c5 100644
--- a/mi/mizerline.c
+++ b/mi/mizerline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.7 2001/12/14 20:00:29 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/miext/layer/layer.h b/miext/layer/layer.h
index 630438057..217d7b554 100644
--- a/miext/layer/layer.h
+++ b/miext/layer/layer.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.5 2002/10/03 22:50:21 keithp Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c
index 52490d286..ae4e4861f 100644
--- a/miext/layer/layergc.c
+++ b/miext/layer/layergc.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.5 2001/10/28 03:34:15 tsi Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c
index 6cbca7150..f50d2d23a 100644
--- a/miext/layer/layerinit.c
+++ b/miext/layer/layerinit.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.7 2003/11/10 18:22:49 tsi Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c
index ef412a2c5..eb3fec897 100644
--- a/miext/layer/layerpict.c
+++ b/miext/layer/layerpict.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.2 2003/08/22 19:27:32 eich Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h
index 401dfd96f..0290aabe0 100644
--- a/miext/layer/layerstr.h
+++ b/miext/layer/layerstr.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c
index 44a5df24c..ae436ae85 100644
--- a/miext/layer/layerwin.c
+++ b/miext/layer/layerwin.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h
index 56afd7331..fc17717e1 100644
--- a/miext/rootless/accel/rlAccel.h
+++ b/miext/rootless/accel/rlAccel.h
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/miext/rootless/accel/rlAccel.h,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
/*
* rlBlt.c
diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c
index ba6fdf227..757c5da1f 100644
--- a/miext/rootless/accel/rlBlt.c
+++ b/miext/rootless/accel/rlBlt.c
@@ -26,7 +26,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlBlt.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "rootlessCommon.h"
diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c
index cbd58b4cf..1aabe721f 100644
--- a/miext/rootless/accel/rlCopy.c
+++ b/miext/rootless/accel/rlCopy.c
@@ -22,7 +22,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlCopy.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "rlAccel.h"
diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c
index 7fd7adfa8..485cffea7 100644
--- a/miext/rootless/accel/rlFill.c
+++ b/miext/rootless/accel/rlFill.c
@@ -22,7 +22,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFill.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "rlAccel.h"
diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c
index 2ce9eae2b..7d8c88575 100644
--- a/miext/rootless/accel/rlFillRect.c
+++ b/miext/rootless/accel/rlFillRect.c
@@ -22,7 +22,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillRect.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "rlAccel.h"
diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c
index fd5ee35f5..528300317 100644
--- a/miext/rootless/accel/rlFillSpans.c
+++ b/miext/rootless/accel/rlFillSpans.c
@@ -22,7 +22,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillSpans.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "rlAccel.h"
diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c
index 2bf2da64b..565d841fa 100644
--- a/miext/rootless/accel/rlGlyph.c
+++ b/miext/rootless/accel/rlGlyph.c
@@ -22,7 +22,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "fontstruct.h"
diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c
index e2249569b..93d055af9 100644
--- a/miext/rootless/accel/rlSolid.c
+++ b/miext/rootless/accel/rlSolid.c
@@ -26,7 +26,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlSolid.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "rootlessCommon.h"
diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h
index 2b375706f..84e59f885 100644
--- a/miext/rootless/rootless.h
+++ b/miext/rootless/rootless.h
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootless.h,v 1.6 2003/10/24 00:33:14 torrey Exp $ */
+/* $XFree86$ */
#ifndef _ROOTLESS_H
#define _ROOTLESS_H
diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c
index bc6259ea6..2ac9a1a0d 100644
--- a/miext/rootless/rootlessCommon.c
+++ b/miext/rootless/rootlessCommon.c
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.5 2003/11/10 18:22:50 tsi Exp $ */
+/* $XFree86$ */
#include "rootlessCommon.h"
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 973ec6291..9e2e04f02 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -27,7 +27,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.4 2003/09/16 00:36:20 torrey Exp $ */
+/* $XFree86$ */
#ifndef _ROOTLESSCOMMON_H
#define _ROOTLESSCOMMON_H
diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h
index 1a1a48a4a..36e7c89f4 100644
--- a/miext/rootless/rootlessConfig.h
+++ b/miext/rootless/rootlessConfig.h
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.2 2003/10/24 00:33:14 torrey Exp $ */
+/* $XFree86$ */
#ifndef _ROOTLESSCONFIG_H
#define _ROOTLESSCONFIG_H
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index 8c70135a1..a8933e00b 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.2 2003/10/24 00:33:14 torrey Exp $ */
+/* $XFree86$ */
#include "mi.h"
#include "scrnintstr.h"
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index beb737df1..d979cb5cc 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.3 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#include "mi.h"
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c
index a95917939..614b389e2 100644
--- a/miext/rootless/rootlessValTree.c
+++ b/miext/rootless/rootlessValTree.c
@@ -3,7 +3,7 @@
*
* This file is very closely based on mivaltree.c.
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.2 2003/11/10 18:22:50 tsi Exp $ */
+/* $XFree86$ */
/*
* mivaltree.c --
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index b970399c7..90cd5943d 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -28,7 +28,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.11 2003/11/27 01:53:39 torrey Exp $ */
+/* $XFree86$ */
#include "rootlessCommon.h"
#include "rootlessWindow.h"
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index f6736f544..9628c9ef4 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */
+/* $XFree86$ */
#ifndef _ROOTLESSWINDOW_H
#define _ROOTLESSWINDOW_H
diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h
index 90efec5c8..85efafeb7 100644
--- a/miext/rootless/safeAlpha/safeAlpha.h
+++ b/miext/rootless/safeAlpha/safeAlpha.h
@@ -26,7 +26,7 @@
* 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: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.3 2004/01/19 01:22:48 torrey Exp $ */
+/* $XFree86$ */
#ifndef _SAFEALPHA_H
#define _SAFEALPHA_H
diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c
index 3c9d39628..e3d3a3170 100644
--- a/miext/rootless/safeAlpha/safeAlphaPicture.c
+++ b/miext/rootless/safeAlpha/safeAlphaPicture.c
@@ -32,7 +32,7 @@
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*/
- /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.4 2004/01/19 01:22:48 torrey Exp $ */
+ /* $XFree86$ */
#ifdef RENDER
diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c
index 51acb01c5..e9f82f820 100644
--- a/miext/rootless/safeAlpha/safeAlphaWindow.c
+++ b/miext/rootless/safeAlpha/safeAlphaWindow.c
@@ -31,7 +31,7 @@
*
* Copyright © 1998 Keith Packard
*/
-/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/01/19 01:22:48 torrey Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "safeAlpha.h"
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index 38a92953f..22c1737a9 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h
index d8ade93dc..094dec33d 100644
--- a/miext/shadow/shadow.h
+++ b/miext/shadow/shadow.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.7 2002/12/02 20:37:24 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c
index 028ec26a5..9edd8338e 100644
--- a/miext/shadow/shalloc.c
+++ b/miext/shadow/shalloc.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c
index 818a37a8e..c6ba28f4d 100644
--- a/miext/shadow/shpacked.c
+++ b/miext/shadow/shpacked.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c
index 148782956..a6eb2f550 100644
--- a/miext/shadow/shplanar.c
+++ b/miext/shadow/shplanar.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c
index c82b5f931..2f5ee8cdd 100644
--- a/miext/shadow/shplanar8.c
+++ b/miext/shadow/shplanar8.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c
index a1ff273de..16b146352 100644
--- a/miext/shadow/shrot16pack.c
+++ b/miext/shadow/shrot16pack.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c
index 7ba41833e..3786444d4 100644
--- a/miext/shadow/shrot16pack_180.c
+++ b/miext/shadow/shrot16pack_180.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c
index 0b3c4e0ac..d2c9271f4 100644
--- a/miext/shadow/shrot16pack_270.c
+++ b/miext/shadow/shrot16pack_270.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c
index 574b3a157..36cf94489 100644
--- a/miext/shadow/shrot16pack_90.c
+++ b/miext/shadow/shrot16pack_90.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c
index 327636efb..3ef791608 100644
--- a/miext/shadow/shrot32pack.c
+++ b/miext/shadow/shrot32pack.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c
index 838622267..943d6485e 100644
--- a/miext/shadow/shrot32pack_180.c
+++ b/miext/shadow/shrot32pack_180.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c
index b0dd28316..0038c624c 100644
--- a/miext/shadow/shrot32pack_270.c
+++ b/miext/shadow/shrot32pack_270.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c
index 9bdb18e25..1183ba65a 100644
--- a/miext/shadow/shrot32pack_90.c
+++ b/miext/shadow/shrot32pack_90.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c
index 7af181f19..885c5e9a2 100644
--- a/miext/shadow/shrot8pack.c
+++ b/miext/shadow/shrot8pack.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack.c,v 1.1 2000/09/08 21:46:46 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c
index 316c0c690..7bdb2a932 100644
--- a/miext/shadow/shrot8pack_180.c
+++ b/miext/shadow/shrot8pack_180.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c
index bed542f6d..483f05f79 100644
--- a/miext/shadow/shrot8pack_270.c
+++ b/miext/shadow/shrot8pack_270.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c
index f2618fc47..8c93d21ed 100644
--- a/miext/shadow/shrot8pack_90.c
+++ b/miext/shadow/shrot8pack_90.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c
index 1277c2ee1..d5326d176 100644
--- a/miext/shadow/shrotate.c
+++ b/miext/shadow/shrotate.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h
index ce9b4c561..2998ce64f 100644
--- a/miext/shadow/shrotpack.h
+++ b/miext/shadow/shrotpack.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard
*
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 221296d11..6b1325d0d 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.43 2003/10/29 04:17:22 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/os/access.c b/os/access.c
index 14b61839c..c2318bc7e 100644
--- a/os/access.c
+++ b/os/access.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/access.c,v 3.54 2004/01/03 17:38:39 herrb Exp $ */
+/* $XFree86$ */
#ifdef WIN32
#include <X11/Xwinsock.h>
diff --git a/os/auth.c b/os/auth.c
index a1cbc8c1f..d5ccec552 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.14 2003/08/27 19:57:21 herrb Exp $ */
+/* $XFree86$ */
/*
* authorization hooks for the server
diff --git a/os/connection.c b/os/connection.c
index 7465e7eff..c2e82bf4e 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.65 2003/10/30 21:21:10 herrb Exp $ */
+/* $XFree86$ */
/*****************************************************************
* Stuff to create connections --- OS dependent
*
diff --git a/os/io.c b/os/io.c
index cf8a0343e..ff2a31375 100644
--- a/os/io.c
+++ b/os/io.c
@@ -53,7 +53,7 @@ SOFTWARE.
* InsertFakeRequest, ResetCurrentRequest
*
*****************************************************************/
-/* $XFree86: xc/programs/Xserver/os/io.c,v 3.35 2003/04/27 21:31:08 herrb Exp $ */
+/* $XFree86$ */
#if 0
#define DEBUG_COMMUNICATION
diff --git a/os/k5auth.c b/os/k5auth.c
index 8c59fe8ab..ffe7b5ad1 100644
--- a/os/k5auth.c
+++ b/os/k5auth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.5 2001/12/14 20:00:34 dawes Exp $ */
+/* $XFree86$ */
/*
* Kerberos V5 authentication scheme
diff --git a/os/lbxio.c b/os/lbxio.c
index ae4d4355f..232d89998 100644
--- a/os/lbxio.c
+++ b/os/lbxio.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.18 2003/04/27 21:31:09 herrb Exp $ */
+/* $XFree86$ */
/*
Copyright 1996, 1998 The Open Group
diff --git a/os/mitauth.c b/os/mitauth.c
index bddbdf1d6..b4390f274 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.5 2001/12/14 20:00:34 dawes Exp $ */
+/* $XFree86$ */
/*
* MIT-MAGIC-COOKIE-1 authorization scheme
diff --git a/os/oscolor.c b/os/oscolor.c
index f6e941fb8..06965a3ba 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.11 2003/09/24 02:43:36 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/os/osdep.h b/os/osdep.h
index a5392ffc3..c05c1b8fa 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.18 2003/04/27 21:31:09 herrb Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/os/osinit.c b/os/osinit.c
index 1c56d0af7..c9b662bbf 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.30 2003/10/29 04:17:22 dawes Exp $ */
+/* $XFree86$ */
/***********************************************************
Copyright 1987, 1998 The Open Group
diff --git a/os/rpcauth.c b/os/rpcauth.c
index 512b3ecb5..1733f7896 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.8 2003/04/27 21:31:09 herrb Exp $ */
+/* $XFree86$ */
/*
* SUN-DES-1 authentication mechanism
diff --git a/os/secauth.c b/os/secauth.c
index 4f90fe9a9..5932c8f4d 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -24,7 +24,7 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.11 2001/12/14 20:00:35 dawes Exp $ */
+/* $XFree86$ */
#include "X.h"
#include "os.h"
diff --git a/os/strlcat.c b/os/strlcat.c
index cda5c6ab9..7031de3a6 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -15,7 +15,7 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/misc/strlcat.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
diff --git a/os/strlcpy.c b/os/strlcpy.c
index 14e45ef8c..71657da69 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -15,7 +15,7 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/misc/strlcpy.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */
+/* $XFree86$ */
#include <sys/types.h>
#include <string.h>
diff --git a/os/utils.c b/os/utils.c
index 924d97471..dd5ff4e20 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -49,7 +49,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.97 2004/01/09 00:35:06 dawes Exp $ */
+/* $XFree86$ */
#ifdef __CYGWIN__
#include <stdlib.h>
diff --git a/os/xalloc.c b/os/xalloc.c
index 8bb46e2c9..e9b9f321a 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from
Pascal Haible.
*/
-/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.36 2003/11/03 05:12:00 tsi Exp $ */
+/* $XFree86$ */
/* Only used if INTERNAL_MALLOC is defined
* - otherwise xalloc() in utils.c is used
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 13695c13c..77f532899 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.9 2003/06/24 15:44:48 eich Exp $ */
+/* $XFree86$ */
/*
* XDM-AUTHENTICATION-1 (XDMCP authentication) and
diff --git a/os/xdmcp.c b/os/xdmcp.c
index cbd43f45b..1b3e38ef5 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -13,7 +13,7 @@
* without express or implied warranty.
*
*/
-/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.32 2004/01/01 17:09:29 herrb Exp $ */
+/* $XFree86$ */
#ifdef WIN32
/* avoid conflicting definitions */
diff --git a/randr/mirandr.c b/randr/mirandr.c
index b45a1f9a8..b59c34f0d 100644
--- a/randr/mirandr.c
+++ b/randr/mirandr.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000, Compaq Computer Corporation,
* Copyright © 2002, Hewlett Packard, Inc.
diff --git a/randr/randr.c b/randr/randr.c
index c0a8c4bf8..08a601548 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000, Compaq Computer Corporation,
* Copyright © 2002, Hewlett Packard, Inc.
diff --git a/randr/randrstr.h b/randr/randrstr.h
index d966cd5b7..6eef13f0e 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Compaq Computer Corporation
*
diff --git a/record/record.c b/record/record.c
index 3657ef42b..f54625a6e 100644
--- a/record/record.c
+++ b/record/record.c
@@ -32,7 +32,7 @@ This work benefited from earlier work done by Martha Zimet of NCD
and Jim Haggerty of Metheus.
*/
-/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "dixstruct.h"
diff --git a/record/set.c b/record/set.c
index 847a1b28d..117926256 100644
--- a/record/set.c
+++ b/record/set.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86$ */
/*
diff --git a/record/set.h b/record/set.h
index 169077720..6f0b872a1 100644
--- a/record/set.h
+++ b/record/set.h
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86$ */
/*
A Set Abstract Data Type (ADT) for the RECORD Extension
diff --git a/render/animcur.c b/render/animcur.c
index fcf6a25a7..1df212ea0 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.6 2003/11/03 05:12:01 tsi Exp $
+ * $XFree86$
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/render/filter.c b/render/filter.c
index a2f7563cb..4435197e2 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $
+ * $XFree86$
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/render/glyph.c b/render/glyph.c
index b4f08c223..9b8ab3b33 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.6 2001/10/28 03:34:19 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/glyphstr.h b/render/glyphstr.h
index 99f55e3eb..3137f4d20 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.4 2001/01/21 21:19:39 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/miglyph.c b/render/miglyph.c
index 00b6764d6..98cd69ab4 100644
--- a/render/miglyph.c
+++ b/render/miglyph.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.6 2000/12/05 03:13:31 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/miindex.c b/render/miindex.c
index 739348273..ac886800f 100644
--- a/render/miindex.c
+++ b/render/miindex.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.8 2002/11/06 22:45:36 keithp Exp $
+ * $XFree86$
*
* Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/render/mipict.c b/render/mipict.c
index 0f0cf6c8b..25cf69e19 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.16 2003/11/10 18:22:52 tsi Exp $
+ * $XFree86$
*
* Copyright © 1999 Keith Packard
*
diff --git a/render/mipict.h b/render/mipict.h
index 0154fb5f0..7903a6497 100644
--- a/render/mipict.h
+++ b/render/mipict.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.13 2002/11/06 22:45:36 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/mirect.c b/render/mirect.c
index 33c7a9f14..0d9179c40 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.4 2001/06/08 19:36:34 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/render/mitrap.c b/render/mitrap.c
index 7f592ccd4..b7d4a0157 100644
--- a/render/mitrap.c
+++ b/render/mitrap.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.9 2002/11/05 23:39:16 keithp Exp $
+ * $XFree86$
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/render/mitri.c b/render/mitri.c
index fc706f117..385cdb5d4 100644
--- a/render/mitri.c
+++ b/render/mitri.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.6 2002/08/12 04:03:21 keithp Exp $
+ * $XFree86$
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
diff --git a/render/picture.c b/render/picture.c
index b2ef69bdf..898d1978b 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/picture.c,v 1.30 2003/01/26 16:40:43 eich Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/picture.h b/render/picture.h
index c47d51941..c62af488b 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/picture.h,v 1.21 2003/11/03 05:12:01 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/picturestr.h b/render/picturestr.h
index cb5ea0ac9..c14046cf2 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/render/render.c b/render/render.c
index 0d89885c3..c149bc9a1 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $
+ * $XFree86$
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 5bc7f65fc..162e955d3 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#ifndef XKB_IN_SERVER
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 209631e72..9eb184b25 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 20def46ba..6db68fd4a 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#ifndef XKB_IN_SERVER
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 06660ff89..06939c204 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#ifndef XKB_IN_SERVER
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index bb02619f3..b28431ba2 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.10 2003/11/17 22:20:44 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c
index 2485488d2..1027930ca 100644
--- a/xkb/ddxConfig.c
+++ b/xkb/ddxConfig.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index c7c8f18b8..5e69d7fda 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 5f5ebc9b4..f669c962d 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c
index 9f54cae6f..033aa18ea 100644
--- a/xkb/ddxFakeBtn.c
+++ b/xkb/ddxFakeBtn.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxFakeBtn.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 289fa3bfb..bff186b7f 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.6 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index a8c436ea2..dea4ce607 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxInit.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index afd028fcd..c0b2b8018 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxKeyClick.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 9ac7d3300..927c8a86a 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index ab757c6fc..e7c484cab 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxLEDs.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index 5101de53b..96d856db5 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 9f7704c5a..af1503c5a 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.36 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index dd7ef4630..827627930 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.3 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index ec43f79db..ba4dca862 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/maprules.c b/xkb/maprules.c
index c588ae399..3a52f2289 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkb.c b/xkb/xkb.c
index f43fb285f..38f3c2c26 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.23 2003/12/22 17:48:11 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include "X.h"
diff --git a/xkb/xkb.h b/xkb/xkb.h
index 4eeb781db..704cd49c0 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/xkb/xkb.h,v 1.1 2003/07/16 01:39:08 dawes Exp $ */
+/* $XFree86$ */
/* #include "XKBfile.h" */
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 096ebe2e4..90fc609b3 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.10 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <math.h>
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 403c2fb89..9972ec8da 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.14 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <math.h>
diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h
index 910616e60..a6daea20e 100644
--- a/xkb/xkbDflts.h
+++ b/xkb/xkbDflts.h
@@ -1,5 +1,5 @@
/* $Xorg: xkbDflts.h,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
-/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.3 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
/* This file generated automatically by xkbcomp */
/* DO NOT EDIT */
#ifndef DEFAULT_H
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 0cd1becac..300142c5f 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.12 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_EVENTS 1
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 6ed146494..71f97d375 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.33 2003/12/22 17:48:12 tsi Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index f75db6918..e7441b0bf 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.8 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 3a9fc11f8..df7912a9c 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.9 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <math.h>
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index 0a077f4c1..ec155645f 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.2 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <math.h>
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 6f4ffe8a9..680ea4551 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.5 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include "stdio.h"
#include "X.h"
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index f3ba6bc17..2617fd261 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.17 2003/11/17 22:20:46 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c
index 0e480b4df..3b024ec0b 100644
--- a/xkb/xkbconfig.c
+++ b/xkb/xkbconfig.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c
index d12467ff7..10fad7b12 100644
--- a/xkb/xkberrs.c
+++ b/xkb/xkberrs.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 2a6d836aa..c401e7112 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index d688aca01..3f37b075d 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.10 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index fc593e796..f1e311030 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#include <ctype.h>
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index b7a08e267..3eef06ada 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>