From dae90c3af98edd5e95289abd930b3872c996c503 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Mar 2004 08:34:49 +0000 Subject: [PATCH] Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 --- GL/apple/aglGlx.c | 2 +- GL/apple/indirect.c | 2 +- GL/glx/g_disptab.c | 2 +- GL/glx/g_disptab.h | 2 +- GL/glx/g_disptab_EXT.c | 2 +- GL/glx/g_disptab_EXT.h | 2 +- GL/glx/g_render.c | 40 +++--- GL/glx/g_renderswap.c | 115 +----------------- GL/glx/g_single.c | 2 +- GL/glx/g_singleswap.c | 38 +----- GL/glx/global.c | 2 +- GL/glx/glxbuf.c | 2 +- GL/glx/glxbuf.h | 2 +- GL/glx/glxcmds.c | 2 +- GL/glx/glxcmdsswap.c | 5 +- GL/glx/glxcontext.h | 2 +- GL/glx/glxdrawable.h | 2 +- GL/glx/glxerror.h | 2 +- GL/glx/glxext.c | 2 +- GL/glx/glxext.h | 2 +- GL/glx/glxfb.c | 2 +- GL/glx/glxfb.h | 2 +- GL/glx/glximports.c | 2 +- GL/glx/glximports.h | 2 +- GL/glx/glxmem.c | 2 +- GL/glx/glxmem.h | 2 +- GL/glx/glxpix.c | 2 +- GL/glx/glxpix.h | 2 +- GL/glx/glxscreens.c | 2 +- GL/glx/glxscreens.h | 2 +- GL/glx/glxserver.h | 2 +- GL/glx/glxutil.c | 2 +- GL/glx/glxutil.h | 2 +- GL/glx/impsize.h | 2 +- GL/glx/render2.c | 2 +- GL/glx/render2swap.c | 7 +- GL/glx/renderpix.c | 2 +- GL/glx/renderpixswap.c | 2 +- GL/glx/rensize.c | 2 +- GL/glx/rensizetab.c | 2 +- GL/glx/single2.c | 4 +- GL/glx/single2swap.c | 4 +- GL/glx/singlepix.c | 2 +- GL/glx/singlepixswap.c | 2 +- GL/glx/singlesize.c | 2 +- GL/glx/singlesize.h | 2 +- GL/glx/unpack.h | 7 +- GL/glx/xfont.c | 2 +- GL/include/GL/glx_ansic.h | 2 +- GL/include/GL/xf86glx.h | 2 +- XTrap/xtrapddmi.c | 2 +- XTrap/xtrapdi.c | 2 +- XTrap/xtrapdiswp.c | 2 +- XTrap/xtrapditbl.c | 2 +- Xext/EVI.c | 2 +- Xext/EVIstruct.h | 2 +- Xext/appgroup.c | 2 +- Xext/appgroup.h | 2 +- Xext/bigreq.c | 2 +- Xext/cup.c | 2 +- Xext/dpms.c | 2 +- Xext/dpmsproc.h | 2 +- Xext/dpmsstubs.c | 2 +- Xext/fontcache.c | 2 +- Xext/mbuf.c | 2 +- Xext/mbufbf.c | 2 +- Xext/mbufpx.c | 2 +- Xext/mitmisc.c | 2 +- Xext/panoramiX.c | 2 +- Xext/panoramiX.h | 2 +- Xext/panoramiXSwap.c | 2 +- Xext/panoramiXh.h | 2 +- Xext/panoramiXprocs.c | 2 +- Xext/panoramiXsrv.h | 2 +- Xext/sampleEVI.c | 2 +- Xext/saver.c | 7 +- Xext/security.c | 2 +- Xext/shape.c | 2 +- Xext/shm.c | 2 +- Xext/sleepuntil.c | 2 +- Xext/sync.c | 2 +- Xext/xcmisc.c | 2 +- Xext/xf86bigfont.c | 2 +- Xext/xprint.c | 2 +- Xext/xres.c | 24 ++-- Xext/xtest.c | 2 +- Xext/xtest1dd.c | 2 +- Xext/xtest1dd.h | 2 +- Xext/xtest1di.c | 2 +- Xext/xvdisp.c | 2 +- Xext/xvdisp.h | 2 +- Xext/xvdix.h | 2 +- Xext/xvmain.c | 2 +- Xext/xvmc.c | 2 +- Xext/xvmcext.h | 2 +- Xi/allowev.c | 2 +- Xi/allowev.h | 2 +- Xi/chgdctl.c | 2 +- Xi/chgdctl.h | 2 +- Xi/chgfctl.c | 2 +- Xi/chgfctl.h | 2 +- Xi/chgkbd.c | 2 +- Xi/chgkbd.h | 2 +- Xi/chgkmap.c | 2 +- Xi/chgkmap.h | 2 +- Xi/chgprop.c | 2 +- Xi/chgprop.h | 2 +- Xi/chgptr.c | 2 +- Xi/chgptr.h | 2 +- Xi/closedev.c | 2 +- Xi/closedev.h | 2 +- Xi/devbell.c | 2 +- Xi/devbell.h | 2 +- Xi/exevents.c | 2 +- Xi/exglobals.h | 2 +- Xi/extinit.c | 2 +- Xi/getbmap.c | 2 +- Xi/getbmap.h | 2 +- Xi/getdctl.c | 2 +- Xi/getdctl.h | 2 +- Xi/getfctl.c | 2 +- Xi/getfctl.h | 2 +- Xi/getfocus.c | 2 +- Xi/getfocus.h | 2 +- Xi/getkmap.c | 2 +- Xi/getkmap.h | 2 +- Xi/getmmap.c | 2 +- Xi/getmmap.h | 2 +- Xi/getprop.c | 2 +- Xi/getprop.h | 2 +- Xi/getselev.c | 2 +- Xi/getselev.h | 2 +- Xi/getvers.c | 2 +- Xi/getvers.h | 2 +- Xi/grabdev.c | 2 +- Xi/grabdev.h | 2 +- Xi/grabdevb.c | 2 +- Xi/grabdevb.h | 2 +- Xi/grabdevk.c | 2 +- Xi/grabdevk.h | 2 +- Xi/gtmotion.c | 2 +- Xi/gtmotion.h | 2 +- Xi/listdev.c | 2 +- Xi/listdev.h | 2 +- Xi/opendev.c | 2 +- Xi/opendev.h | 2 +- Xi/queryst.c | 2 +- Xi/queryst.h | 2 +- Xi/selectev.c | 2 +- Xi/selectev.h | 2 +- Xi/sendexev.c | 2 +- Xi/sendexev.h | 2 +- Xi/setbmap.c | 2 +- Xi/setbmap.h | 2 +- Xi/setdval.c | 2 +- Xi/setdval.h | 2 +- Xi/setfocus.c | 2 +- Xi/setfocus.h | 2 +- Xi/setmmap.c | 2 +- Xi/setmmap.h | 2 +- Xi/setmode.c | 2 +- Xi/setmode.h | 2 +- Xi/stubs.c | 2 +- Xi/ungrdev.c | 2 +- Xi/ungrdev.h | 2 +- Xi/ungrdevb.c | 2 +- Xi/ungrdevb.h | 2 +- Xi/ungrdevk.c | 2 +- Xi/ungrdevk.h | 2 +- Xprint/AttrValid.c | 2 +- Xprint/AttrValid.h | 2 +- Xprint/DiPrint.h | 2 +- Xprint/Init.c | 2 +- Xprint/Oid.c | 2 +- Xprint/Oid.h | 2 +- Xprint/OidStrs.h | 2 +- Xprint/Util.c | 2 +- Xprint/ValTree.c | 2 +- Xprint/attributes.c | 2 +- Xprint/attributes.h | 2 +- Xprint/ddxInit.c | 2 +- Xprint/mediaSizes.c | 2 +- Xprint/pcl/Pcl.h | 2 +- Xprint/pcl/PclArc.c | 2 +- Xprint/pcl/PclArea.c | 2 +- Xprint/pcl/PclColor.c | 2 +- Xprint/pcl/PclCursor.c | 2 +- Xprint/pcl/PclFonts.c | 2 +- Xprint/pcl/PclGC.c | 2 +- Xprint/pcl/PclInit.c | 2 +- Xprint/pcl/PclLine.c | 2 +- Xprint/pcl/PclMisc.c | 2 +- Xprint/pcl/PclPixel.c | 2 +- Xprint/pcl/PclPixmap.c | 2 +- Xprint/pcl/PclPolygon.c | 2 +- Xprint/pcl/PclPrint.c | 2 +- Xprint/pcl/PclSFonts.c | 2 +- Xprint/pcl/PclSpans.c | 2 +- Xprint/pcl/PclText.c | 2 +- Xprint/pcl/PclWindow.c | 2 +- Xprint/pcl/Pclmap.h | 2 +- Xprint/ps/Ps.h | 2 +- Xprint/ps/PsAttVal.c | 2 +- Xprint/ps/PsAttr.c | 2 +- Xprint/ps/PsColor.c | 2 +- Xprint/ps/PsFonts.c | 2 +- Xprint/ps/PsGC.c | 2 +- Xprint/ps/PsInit.c | 2 +- Xprint/ps/PsLine.c | 2 +- Xprint/ps/PsMisc.c | 2 +- Xprint/ps/PsPixel.c | 2 +- Xprint/ps/PsPixmap.c | 2 +- Xprint/ps/PsPolygon.c | 2 +- Xprint/ps/PsPrint.c | 2 +- Xprint/ps/PsSpans.c | 2 +- Xprint/ps/PsText.c | 2 +- Xprint/ps/PsWindow.c | 2 +- Xprint/ps/psout.c | 2 +- Xprint/ps/psout.h | 2 +- Xprint/raster/Raster.c | 2 +- Xprint/raster/Raster.h | 2 +- Xprint/raster/RasterAttVal.c | 2 +- afb/afb.h | 2 +- afb/afbbitblt.c | 2 +- afb/afbblt.c | 2 +- afb/afbbres.c | 2 +- afb/afbbresd.c | 2 +- afb/afbbstore.c | 2 +- afb/afbclip.c | 2 +- afb/afbcmap.c | 2 +- afb/afbfillarc.c | 2 +- afb/afbfillrct.c | 2 +- afb/afbfillsp.c | 2 +- afb/afbfont.c | 2 +- afb/afbgc.c | 2 +- afb/afbgetsp.c | 2 +- afb/afbhrzvert.c | 2 +- afb/afbimage.c | 2 +- afb/afbimggblt.c | 2 +- afb/afbline.c | 2 +- afb/afbmisc.c | 2 +- afb/afbpixmap.c | 2 +- afb/afbply1rct.c | 2 +- afb/afbplygblt.c | 2 +- afb/afbpntarea.c | 2 +- afb/afbpntwin.c | 2 +- afb/afbpolypnt.c | 2 +- afb/afbpushpxl.c | 2 +- afb/afbscrinit.c | 2 +- afb/afbsetsp.c | 2 +- afb/afbtegblt.c | 2 +- afb/afbtile.c | 2 +- afb/afbwindow.c | 2 +- afb/afbzerarc.c | 2 +- cfb/cfb.h | 2 +- cfb/cfb8bit.c | 2 +- cfb/cfb8bit.h | 2 +- cfb/cfb8line.c | 2 +- cfb/cfballpriv.c | 2 +- cfb/cfbbitblt.c | 2 +- cfb/cfbblt.c | 2 +- cfb/cfbbres.c | 2 +- cfb/cfbbresd.c | 2 +- cfb/cfbbstore.c | 2 +- cfb/cfbcmap.c | 2 +- cfb/cfbcppl.c | 2 +- cfb/cfbfillarc.c | 2 +- cfb/cfbfillrct.c | 2 +- cfb/cfbfillsp.c | 2 +- cfb/cfbgc.c | 2 +- cfb/cfbgetsp.c | 2 +- cfb/cfbglblt8.c | 2 +- cfb/cfbhrzvert.c | 2 +- cfb/cfbigblt8.c | 2 +- cfb/cfbimage.c | 2 +- cfb/cfbline.c | 2 +- cfb/cfbmap.h | 2 +- cfb/cfbmskbits.c | 2 +- cfb/cfbmskbits.h | 2 +- cfb/cfbpixmap.c | 2 +- cfb/cfbply1rct.c | 2 +- cfb/cfbpntwin.c | 2 +- cfb/cfbpolypnt.c | 2 +- cfb/cfbpush8.c | 2 +- cfb/cfbrctstp8.c | 2 +- cfb/cfbrrop.c | 2 +- cfb/cfbrrop.h | 2 +- cfb/cfbscrinit.c | 2 +- cfb/cfbsetsp.c | 2 +- cfb/cfbsolid.c | 2 +- cfb/cfbtab.h | 2 +- cfb/cfbteblt8.c | 2 +- cfb/cfbtegblt.c | 2 +- cfb/cfbtile32.c | 2 +- cfb/cfbtileodd.c | 2 +- cfb/cfbwindow.c | 2 +- cfb/cfbzerarc.c | 2 +- cfb/stip68kgnu.h | 2 +- cfb/stipsparc.s | 2 +- cfb/stipsprc32.s | 2 +- cfb24/cfbrrop24.h | 2 +- dbe/dbe.c | 2 +- dbe/dbestruct.h | 2 +- dbe/midbe.c | 2 +- dbe/midbe.h | 2 +- dix/atom.c | 2 +- dix/colormap.c | 2 +- dix/cursor.c | 2 +- dix/devices.c | 2 +- dix/dispatch.c | 2 +- dix/dispatch.h | 2 +- dix/dixfonts.c | 2 +- dix/dixutils.c | 2 +- dix/events.c | 2 +- dix/extension.c | 2 +- dix/gc.c | 2 +- dix/globals.c | 2 +- dix/grabs.c | 2 +- dix/main.c | 2 +- dix/pixmap.c | 2 +- dix/privates.c | 2 +- dix/property.c | 2 +- dix/resource.c | 2 +- dix/swaprep.c | 2 +- dix/swapreq.c | 2 +- dix/tables.c | 2 +- dix/window.c | 2 +- dix/xpstubs.c | 2 +- doc/Xserver.man.pre | 2 +- doc/smartsched | 2 +- fb/fb.h | 2 +- fb/fb24_32.c | 2 +- fb/fb24_32.h | 2 +- fb/fballpriv.c | 2 +- fb/fbarc.c | 2 +- fb/fbbits.c | 2 +- fb/fbbits.h | 2 +- fb/fbblt.c | 2 +- fb/fbbltone.c | 2 +- fb/fbbstore.c | 2 +- fb/fbcmap.c | 2 +- fb/fbcompose.c | 2 +- fb/fbcopy.c | 2 +- fb/fbfill.c | 2 +- fb/fbfillrect.c | 2 +- fb/fbfillsp.c | 2 +- fb/fbgc.c | 2 +- fb/fbgetsp.c | 2 +- fb/fbglyph.c | 2 +- fb/fbimage.c | 2 +- fb/fbline.c | 2 +- fb/fboverlay.c | 2 +- fb/fboverlay.h | 2 +- fb/fbpict.c | 2 +- fb/fbpict.h | 2 +- fb/fbpixmap.c | 2 +- fb/fbpoint.c | 2 +- fb/fbpush.c | 2 +- fb/fbrop.h | 2 +- fb/fbscreen.c | 2 +- fb/fbseg.c | 2 +- fb/fbsetsp.c | 2 +- fb/fbsolid.c | 2 +- fb/fbstipple.c | 2 +- fb/fbtile.c | 2 +- fb/fbtrap.c | 2 +- fb/fbutil.c | 2 +- fb/fbwindow.c | 2 +- hw/darwin/XDarwin.man | 2 +- .../bundle/Dutch.lproj/XDarwinHelp.html.cpp | 2 +- .../English.lproj/InfoPlist.strings.cpp | 2 +- .../bundle/English.lproj/Localizable.strings | 2 +- .../bundle/English.lproj/XDarwinHelp.html.cpp | 2 +- .../bundle/French.lproj/XDarwinHelp.html.cpp | 2 +- .../bundle/German.lproj/XDarwinHelp.html.cpp | 2 +- .../Japanese.lproj/XDarwinHelp.html.cpp | 2 +- .../Portuguese.lproj/XDarwinHelp.html.cpp | 2 +- .../bundle/Spanish.lproj/XDarwinHelp.html.cpp | 2 +- .../bundle/Swedish.lproj/XDarwinHelp.html.cpp | 2 +- .../bundle/ko.lproj/XDarwinHelp.html.cpp | 2 +- hw/darwin/bundle/startXClients.cpp | 2 +- hw/darwin/darwin.c | 2 +- hw/darwin/darwin.h | 2 +- hw/darwin/darwinClut8.h | 2 +- hw/darwin/darwinEvents.c | 2 +- hw/darwin/darwinKeyboard.c | 2 +- hw/darwin/darwinKeyboard.h | 2 +- hw/darwin/iokit/xfIOKit.c | 2 +- hw/darwin/iokit/xfIOKit.h | 2 +- hw/darwin/iokit/xfIOKitCursor.c | 2 +- hw/darwin/iokit/xfIOKitStartup.c | 2 +- hw/darwin/quartz/Preferences.h | 2 +- hw/darwin/quartz/Preferences.m | 2 +- hw/darwin/quartz/XApplication.h | 2 +- hw/darwin/quartz/XApplication.m | 2 +- hw/darwin/quartz/XDarwinStartup.c | 2 +- hw/darwin/quartz/XDarwinStartup.man | 2 +- hw/darwin/quartz/XServer.h | 2 +- hw/darwin/quartz/XServer.m | 2 +- hw/darwin/quartz/applewm.c | 2 +- hw/darwin/quartz/applewmExt.h | 2 +- hw/darwin/quartz/cr/XView.h | 2 +- hw/darwin/quartz/cr/XView.m | 2 +- hw/darwin/quartz/cr/cr.h | 2 +- hw/darwin/quartz/cr/crAppleWM.m | 2 +- hw/darwin/quartz/cr/crFrame.m | 2 +- hw/darwin/quartz/cr/crScreen.m | 2 +- hw/darwin/quartz/fullscreen/fullscreen.c | 2 +- hw/darwin/quartz/fullscreen/quartzCursor.c | 2 +- hw/darwin/quartz/fullscreen/quartzCursor.h | 2 +- hw/darwin/quartz/keysym2ucs.c | 2 +- hw/darwin/quartz/keysym2ucs.h | 2 +- hw/darwin/quartz/pseudoramiX.c | 2 +- hw/darwin/quartz/pseudoramiX.h | 2 +- hw/darwin/quartz/quartz.c | 2 +- hw/darwin/quartz/quartz.h | 2 +- hw/darwin/quartz/quartzAudio.c | 2 +- hw/darwin/quartz/quartzAudio.h | 2 +- hw/darwin/quartz/quartzCocoa.m | 2 +- hw/darwin/quartz/quartzCommon.h | 2 +- hw/darwin/quartz/quartzCursor.c | 2 +- hw/darwin/quartz/quartzCursor.h | 2 +- hw/darwin/quartz/quartzKeyboard.c | 2 +- hw/darwin/quartz/quartzPasteboard.c | 2 +- hw/darwin/quartz/quartzPasteboard.h | 2 +- hw/darwin/quartz/quartzStartup.c | 2 +- hw/darwin/quartz/xpr/Xplugin.h | 2 +- hw/darwin/quartz/xpr/appledri.c | 2 +- hw/darwin/quartz/xpr/dri.c | 2 +- hw/darwin/quartz/xpr/dri.h | 2 +- hw/darwin/quartz/xpr/dristruct.h | 2 +- hw/darwin/quartz/xpr/x-hash.c | 2 +- hw/darwin/quartz/xpr/x-hash.h | 2 +- hw/darwin/quartz/xpr/x-hook.c | 2 +- hw/darwin/quartz/xpr/x-hook.h | 2 +- hw/darwin/quartz/xpr/x-list.c | 2 +- hw/darwin/quartz/xpr/x-list.h | 2 +- hw/darwin/quartz/xpr/xpr.h | 2 +- hw/darwin/quartz/xpr/xprAppleWM.c | 2 +- hw/darwin/quartz/xpr/xprCursor.c | 2 +- hw/darwin/quartz/xpr/xprFrame.c | 2 +- hw/darwin/quartz/xpr/xprScreen.c | 2 +- hw/darwin/utils/README.txt | 2 +- hw/darwin/utils/dumpkeymap.c | 2 +- hw/darwin/utils/dumpkeymap.man | 2 +- hw/vfb/InitInput.c | 2 +- hw/vfb/InitOutput.c | 67 +++++++++- hw/vfb/Xvfb.man.pre | 32 ++--- hw/xfree86/common/extramodes | 2 +- hw/xfree86/common/modeline2c.pl | 2 +- hw/xfree86/common/vesamodes | 2 +- hw/xfree86/common/xf86Config.c | 2 +- hw/xfree86/common/xf86Configure.c | 2 +- hw/xfree86/common/xf86DGA.c | 2 +- hw/xfree86/common/xf86DefModes.c | 2 +- hw/xfree86/common/xf86KbdMach.c | 2 +- hw/xfree86/common/xf86RandR.c | 2 +- hw/xfree86/common/xf86sbusBus.c | 2 +- hw/xfree86/common/xf86sbusBus.h | 2 +- hw/xfree86/common/xf86xv.c | 2 +- hw/xfree86/common/xisb.c | 2 +- hw/xfree86/common/xisb.h | 2 +- hw/xfree86/ddc/DDC.HOWTO | 2 +- hw/xfree86/ddc/ddcProperty.c | 2 +- hw/xfree86/ddc/edid.c | 2 +- hw/xfree86/ddc/edid.h | 2 +- hw/xfree86/ddc/interpret_edid.c | 2 +- hw/xfree86/ddc/interpret_vdif.c | 2 +- hw/xfree86/ddc/print_edid.c | 2 +- hw/xfree86/ddc/print_vdif.c | 2 +- hw/xfree86/ddc/vdif.h | 2 +- hw/xfree86/ddc/xf86DDC.c | 2 +- hw/xfree86/ddc/xf86DDC.h | 2 +- hw/xfree86/dixmods/GLcoremodule.c | 2 +- hw/xfree86/dixmods/dbemodule.c | 2 +- hw/xfree86/dixmods/extmod/dgaproc.h | 2 +- hw/xfree86/dixmods/extmod/modinit.c | 2 +- hw/xfree86/dixmods/extmod/modinit.h | 2 +- hw/xfree86/dixmods/extmod/vidmodeproc.h | 2 +- hw/xfree86/dixmods/extmod/xf86dga.c | 2 +- hw/xfree86/dixmods/extmod/xf86dga2.c | 2 +- hw/xfree86/dixmods/extmod/xf86dgaext.h | 2 +- hw/xfree86/dixmods/extmod/xf86miscproc.h | 2 +- hw/xfree86/dixmods/extmod/xf86vmode.c | 2 +- hw/xfree86/dixmods/extmod/xvmod.c | 2 +- hw/xfree86/dixmods/extmod/xvmodproc.h | 2 +- hw/xfree86/dixmods/glxmodule.c | 2 +- hw/xfree86/dixmods/laymodule.c | 2 +- hw/xfree86/dixmods/recordmod.c | 2 +- hw/xfree86/dixmods/shmodule.c | 2 +- hw/xfree86/dixmods/xf86XTrapModule.c | 2 +- hw/xfree86/doc/README.DRI | 2 +- hw/xfree86/doc/README.fonts | 2 +- hw/xfree86/doc/README.rapidaccess | 2 +- hw/xfree86/doc/changelogs/CHANGELOG | 40 +++++- hw/xfree86/doc/changelogs/CHANGELOG.ND | 2 +- hw/xfree86/doc/devel/Domain.note | 2 +- hw/xfree86/doc/devel/README.DRIcomp | 2 +- hw/xfree86/doc/devel/Registry | 2 +- hw/xfree86/doc/sgml/DESIGN.sgml | 2 +- hw/xfree86/dri/dri.c | 2 +- hw/xfree86/dri/dri.h | 2 +- hw/xfree86/dri/drimodule.c | 2 +- hw/xfree86/dri/dristruct.h | 2 +- hw/xfree86/dri/sarea.h | 4 +- hw/xfree86/dri/xf86dri.c | 2 +- hw/xfree86/dummylib/README | 2 +- hw/xfree86/dummylib/dummylib.h | 2 +- hw/xfree86/dummylib/fatalerror.c | 2 +- hw/xfree86/dummylib/getvalidbios.c | 2 +- hw/xfree86/dummylib/logvwrite.c | 2 +- hw/xfree86/dummylib/pcitestmulti.c | 2 +- hw/xfree86/dummylib/verrorf.c | 2 +- hw/xfree86/dummylib/xalloc.c | 2 +- hw/xfree86/dummylib/xf86addrestolist.c | 2 +- hw/xfree86/dummylib/xf86allocscripi.c | 2 +- hw/xfree86/dummylib/xf86drvmsg.c | 2 +- hw/xfree86/dummylib/xf86drvmsgverb.c | 2 +- hw/xfree86/dummylib/xf86errorf.c | 2 +- hw/xfree86/dummylib/xf86errorfverb.c | 2 +- hw/xfree86/dummylib/xf86getpagesize.c | 2 +- hw/xfree86/dummylib/xf86getverb.c | 2 +- hw/xfree86/dummylib/xf86info.c | 2 +- hw/xfree86/dummylib/xf86msg.c | 2 +- hw/xfree86/dummylib/xf86msgverb.c | 2 +- hw/xfree86/dummylib/xf86opt.c | 2 +- hw/xfree86/dummylib/xf86screens.c | 2 +- hw/xfree86/dummylib/xf86servisinit.c | 2 +- hw/xfree86/dummylib/xf86verbose.c | 2 +- hw/xfree86/fbdevhw/fbdevhw.c | 2 +- hw/xfree86/fbdevhw/fbdevhw.h | 2 +- hw/xfree86/fbdevhw/fbdevhw.man.pre | 2 +- hw/xfree86/fbdevhw/fbdevhwstub.c | 2 +- hw/xfree86/fbdevhw/fbpriv.h | 2 +- hw/xfree86/getconfig/cfg.man.pre | 2 +- hw/xfree86/getconfig/cfg.sample | 2 +- hw/xfree86/getconfig/getconfig.man.pre | 2 +- hw/xfree86/i2c/xf86i2c.c | 2 +- hw/xfree86/i2c/xf86i2c.h | 2 +- hw/xfree86/i2c/xf86i2cmodule.c | 2 +- hw/xfree86/int10/INT10.HOWTO | 2 +- hw/xfree86/int10/generic.c | 2 +- hw/xfree86/int10/helper_exec.c | 2 +- hw/xfree86/int10/helper_mem.c | 2 +- hw/xfree86/int10/pci.c | 2 +- hw/xfree86/int10/stub.c | 2 +- hw/xfree86/int10/xf86int10.c | 2 +- hw/xfree86/int10/xf86int10.h | 2 +- hw/xfree86/int10/xf86int10module.c | 2 +- hw/xfree86/int10/xf86x86emu.c | 2 +- hw/xfree86/int10/xf86x86emu.h | 2 +- hw/xfree86/loader/SparcMulDiv.S | 2 +- hw/xfree86/loader/aout.h | 2 +- hw/xfree86/loader/aoutloader.c | 2 +- hw/xfree86/loader/aoutloader.h | 2 +- hw/xfree86/loader/ar.h | 2 +- hw/xfree86/loader/coff.h | 2 +- hw/xfree86/loader/coffloader.c | 2 +- hw/xfree86/loader/coffloader.h | 2 +- hw/xfree86/loader/dlloader.h | 2 +- hw/xfree86/loader/elf.h | 2 +- hw/xfree86/loader/elfloader.c | 2 +- hw/xfree86/loader/elfloader.h | 2 +- hw/xfree86/loader/hash.c | 2 +- hw/xfree86/loader/hash.h | 2 +- hw/xfree86/loader/sym.h | 2 +- hw/xfree86/os-support/README.OS-lib | 2 +- hw/xfree86/os-support/bsd/alpha_video.c | 2 +- hw/xfree86/os-support/bsd/arm_video.c | 2 +- hw/xfree86/os-support/bsd/bsdResource.c | 2 +- hw/xfree86/os-support/bsd/bsd_KbdMap.c | 2 +- hw/xfree86/os-support/bsd/bsd_VTsw.c | 2 +- hw/xfree86/os-support/bsd/bsd_apm.c | 2 +- hw/xfree86/os-support/bsd/bsd_axp.c | 2 +- hw/xfree86/os-support/bsd/bsd_ev56.c | 2 +- hw/xfree86/os-support/bsd/bsd_init.c | 2 +- hw/xfree86/os-support/bsd/bsd_io.c | 2 +- hw/xfree86/os-support/bsd/bsd_jstk.c | 2 +- hw/xfree86/os-support/bsd/bsd_kbd.c | 2 +- hw/xfree86/os-support/bsd/bsd_kbd.h | 2 +- hw/xfree86/os-support/bsd/bsd_kmod.c | 2 +- hw/xfree86/os-support/bsd/i386_video.c | 2 +- hw/xfree86/os-support/bsd/libusb/data.c | 2 +- hw/xfree86/os-support/bsd/libusb/descr.c | 2 +- hw/xfree86/os-support/bsd/libusb/parse.c | 2 +- hw/xfree86/os-support/bsd/libusb/usage.c | 2 +- hw/xfree86/os-support/bsd/libusb/usb.3 | 2 +- hw/xfree86/os-support/bsd/libusb/usb.h | 2 +- .../os-support/bsd/libusb/usb_hid_usages | 2 +- hw/xfree86/os-support/bsd/libusb/usbvar.h | 2 +- hw/xfree86/os-support/bsd/memrange.h | 2 +- hw/xfree86/os-support/bsd/ppc_video.c | 2 +- hw/xfree86/os-support/bsd/sparc64_video.c | 2 +- hw/xfree86/os-support/bus/Sbus.c | 2 +- hw/xfree86/os-support/bus/axpPci.c | 2 +- hw/xfree86/os-support/bus/freebsdPci.c | 2 +- hw/xfree86/os-support/bus/linuxPci.c | 2 +- hw/xfree86/os-support/bus/ppcPci.c | 2 +- hw/xfree86/os-support/bus/xf86Sbus.h | 17 +-- hw/xfree86/os-support/drm/drmmodule.c | 2 +- hw/xfree86/os-support/linux/int10/linux.c | 2 +- .../os-support/linux/int10/vm86/linux_vm86.c | 2 +- hw/xfree86/os-support/linux/lnx.h | 2 +- hw/xfree86/os-support/linux/lnxResource.c | 2 +- hw/xfree86/os-support/linux/lnx_KbdMap.c | 2 +- hw/xfree86/os-support/linux/lnx_agp.c | 2 +- hw/xfree86/os-support/linux/lnx_apm.c | 2 +- hw/xfree86/os-support/linux/lnx_axp.c | 2 +- hw/xfree86/os-support/linux/lnx_ev56.c | 2 +- hw/xfree86/os-support/linux/lnx_init.c | 2 +- hw/xfree86/os-support/linux/lnx_io.c | 10 +- hw/xfree86/os-support/linux/lnx_jstk.c | 2 +- hw/xfree86/os-support/linux/lnx_kbd.c | 10 +- hw/xfree86/os-support/linux/lnx_kbd.h | 2 +- hw/xfree86/os-support/linux/lnx_kmod.c | 2 +- hw/xfree86/os-support/linux/lnx_pci.c | 2 +- hw/xfree86/os-support/linux/lnx_video.c | 2 +- hw/xfree86/os-support/lynxos/lynx_init.c | 2 +- hw/xfree86/os-support/lynxos/lynx_io.c | 2 +- hw/xfree86/os-support/lynxos/lynx_mmap.c | 2 +- hw/xfree86/os-support/lynxos/lynx_noinline.c | 2 +- hw/xfree86/os-support/lynxos/lynx_ppc.c | 2 +- hw/xfree86/os-support/lynxos/lynx_video.c | 2 +- hw/xfree86/os-support/misc/BUSmemcpy.S | 2 +- hw/xfree86/os-support/misc/BUSmemcpy.c | 2 +- hw/xfree86/os-support/misc/Delay.c | 2 +- hw/xfree86/os-support/misc/IODelay.S | 2 +- hw/xfree86/os-support/misc/IODelay.c | 2 +- hw/xfree86/os-support/misc/PortIO.S | 62 +++++++++- hw/xfree86/os-support/misc/SlowBcopy.S | 2 +- hw/xfree86/os-support/misc/SlowBcopy.c | 2 +- hw/xfree86/os-support/misc/xf86_IlHack.c | 2 +- hw/xfree86/os-support/misc/xf86_Util.c | 2 +- hw/xfree86/os-support/sco/VTsw_sco.c | 2 +- hw/xfree86/os-support/sco/sco_init.c | 2 +- hw/xfree86/os-support/sco/sco_io.c | 2 +- hw/xfree86/os-support/sco/sco_iop.c | 2 +- hw/xfree86/os-support/sco/sco_mouse.c | 2 +- hw/xfree86/os-support/sco/sco_video.c | 2 +- hw/xfree86/os-support/shared/VTsw_noop.c | 2 +- hw/xfree86/os-support/shared/VTsw_usl.c | 2 +- hw/xfree86/os-support/shared/bios_devmem.c | 2 +- hw/xfree86/os-support/shared/bios_mmap.c | 2 +- hw/xfree86/os-support/shared/inout.S | 2 +- hw/xfree86/os-support/shared/ioperm_noop.c | 2 +- hw/xfree86/os-support/shared/std_kbdEv.c | 2 +- hw/xfree86/os-support/shared/sysv_kbd.c | 2 +- hw/xfree86/os-support/shared/xf86Axp.h | 2 +- hw/xfree86/os-support/solaris/apSolaris.shar | 2 +- hw/xfree86/os-support/solaris/sun_bios.c | 34 ++---- hw/xfree86/os-support/solaris/sun_init.c | 2 +- hw/xfree86/os-support/solaris/sun_inout.s | 2 +- hw/xfree86/os-support/solaris/sun_io.c | 2 +- hw/xfree86/os-support/solaris/sun_kbd.c | 2 +- hw/xfree86/os-support/solaris/sun_kbdEv.c | 2 +- hw/xfree86/os-support/solaris/sun_vid.c | 47 +------ hw/xfree86/os-support/sysv/sysv_init.c | 2 +- hw/xfree86/os-support/sysv/sysv_io.c | 2 +- hw/xfree86/os-support/sysv/sysv_video.c | 2 +- hw/xfree86/os-support/sysv/xqueue.c | 2 +- hw/xfree86/os-support/sysv/xqueue.h | 2 +- hw/xfree86/os-support/xf86OSKbd.h | 2 +- hw/xfree86/os-support/xf86_OSlib.h | 2 +- hw/xfree86/os-support/xf86_OSproc.h | 2 +- hw/xfree86/parser/DRI.c | 2 +- hw/xfree86/parser/cpconfig.c | 2 +- hw/xfree86/rac/xf86RAC.c | 2 +- hw/xfree86/rac/xf86RAC.h | 2 +- hw/xfree86/rac/xf86RACmodule.c | 2 +- hw/xfree86/ramdac/BT.c | 2 +- hw/xfree86/ramdac/BT.h | 2 +- hw/xfree86/ramdac/BTPriv.h | 2 +- hw/xfree86/ramdac/CURSOR.NOTES | 2 +- hw/xfree86/ramdac/IBM.c | 2 +- hw/xfree86/ramdac/IBM.h | 2 +- hw/xfree86/ramdac/IBMPriv.h | 2 +- hw/xfree86/ramdac/TI.c | 2 +- hw/xfree86/ramdac/TI.h | 2 +- hw/xfree86/ramdac/TIPriv.h | 2 +- hw/xfree86/ramdac/xf86Cursor.c | 2 +- hw/xfree86/ramdac/xf86Cursor.h | 2 +- hw/xfree86/ramdac/xf86CursorPriv.h | 2 +- hw/xfree86/ramdac/xf86HWCurs.c | 2 +- hw/xfree86/ramdac/xf86RamDac.c | 2 +- hw/xfree86/ramdac/xf86RamDac.h | 2 +- hw/xfree86/ramdac/xf86RamDacCmap.c | 2 +- hw/xfree86/ramdac/xf86RamDacMod.c | 2 +- hw/xfree86/ramdac/xf86RamDacPriv.h | 2 +- hw/xfree86/scanpci/extrapci.ids | 2 +- hw/xfree86/scanpci/xf86ScanPci.c | 2 +- hw/xfree86/shadowfb/sfbmodule.c | 2 +- hw/xfree86/shadowfb/shadow.c | 2 +- hw/xfree86/shadowfb/shadowfb.h | 2 +- hw/xfree86/utils/gtf/gtf.c | 2 +- hw/xfree86/utils/gtf/gtf.man.pre | 2 +- hw/xfree86/utils/ioport/ioport.c | 2 +- hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c | 2 +- .../utils/kbd_mode/bsd-kbd_mode.man.pre | 2 +- hw/xfree86/utils/kbd_mode/sun-kbd_mode.c | 2 +- .../utils/kbd_mode/sun-kbd_mode.man.pre | 2 +- hw/xfree86/utils/pcitweak/pcitweak.man.pre | 2 +- hw/xfree86/utils/scanpci/scanpci.c | 29 ++++- hw/xfree86/utils/scanpci/scanpci.man.pre | 2 +- hw/xfree86/utils/xorgcfg/TODO | 2 +- hw/xfree86/utils/xorgcfg/accessx.c | 2 +- hw/xfree86/utils/xorgcfg/card-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/card-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/card.xbm | 2 +- hw/xfree86/utils/xorgcfg/card.xpm | 2 +- hw/xfree86/utils/xorgcfg/cards.c | 2 +- hw/xfree86/utils/xorgcfg/cards.h | 2 +- hw/xfree86/utils/xorgcfg/computer.xpm | 2 +- hw/xfree86/utils/xorgcfg/config.c | 2 +- hw/xfree86/utils/xorgcfg/config.h | 2 +- hw/xfree86/utils/xorgcfg/expert.c | 2 +- hw/xfree86/utils/xorgcfg/help.c | 2 +- hw/xfree86/utils/xorgcfg/help.h | 2 +- hw/xfree86/utils/xorgcfg/interface.c | 2 +- hw/xfree86/utils/xorgcfg/keyboard-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/keyboard-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/keyboard.xbm | 2 +- hw/xfree86/utils/xorgcfg/keyboard.xpm | 2 +- hw/xfree86/utils/xorgcfg/loader.c | 2 +- hw/xfree86/utils/xorgcfg/loader.h | 4 +- hw/xfree86/utils/xorgcfg/loadmod.c | 2 +- hw/xfree86/utils/xorgcfg/monitor-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/monitor-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/monitor.xbm | 2 +- hw/xfree86/utils/xorgcfg/monitor.xpm | 2 +- hw/xfree86/utils/xorgcfg/mouse-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/mouse-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/mouse.xbm | 2 +- hw/xfree86/utils/xorgcfg/mouse.xpm | 2 +- hw/xfree86/utils/xorgcfg/options.c | 2 +- hw/xfree86/utils/xorgcfg/options.h | 2 +- hw/xfree86/utils/xorgcfg/screen-cfg.c | 2 +- hw/xfree86/utils/xorgcfg/screen-cfg.h | 2 +- hw/xfree86/utils/xorgcfg/screen.c | 2 +- hw/xfree86/utils/xorgcfg/screen.h | 2 +- hw/xfree86/utils/xorgcfg/startx.c | 2 +- hw/xfree86/utils/xorgcfg/stubs.c | 2 +- hw/xfree86/utils/xorgcfg/stubs.h | 2 +- hw/xfree86/utils/xorgcfg/text-mode.c | 2 +- hw/xfree86/utils/xorgcfg/vidmode.c | 2 +- hw/xfree86/utils/xorgcfg/vidmode.h | 2 +- hw/xfree86/utils/xorgcfg/xf86config.c | 2 +- hw/xfree86/utils/xorgcfg/xf86config.h | 2 +- hw/xfree86/utils/xorgconfig/Cards | 2 +- hw/xfree86/utils/xorgconfig/Cards98 | 2 +- hw/xfree86/utils/xorgconfig/cards.c | 2 +- hw/xfree86/utils/xorgconfig/cards.h | 2 +- hw/xfree86/vbe/vbe.c | 2 +- hw/xfree86/vbe/vbe.h | 2 +- hw/xfree86/vbe/vbeModes.c | 2 +- hw/xfree86/vbe/vbeModes.h | 2 +- hw/xfree86/vbe/vbe_module.c | 2 +- hw/xfree86/vgahw/vgaCmap.c | 2 +- hw/xfree86/x86emu/debug.c | 2 +- hw/xfree86/x86emu/decode.c | 2 +- hw/xfree86/x86emu/fpu.c | 2 +- hw/xfree86/x86emu/ops.c | 2 +- hw/xfree86/x86emu/ops2.c | 2 +- hw/xfree86/x86emu/sys.c | 2 +- hw/xfree86/x86emu/x86emu.h | 2 +- hw/xfree86/x86emu/x86emu/debug.h | 2 +- hw/xfree86/x86emu/x86emu/decode.h | 2 +- hw/xfree86/x86emu/x86emu/fpu_regs.h | 2 +- hw/xfree86/x86emu/x86emu/prim_asm.h | 2 +- hw/xfree86/x86emu/x86emu/regs.h | 2 +- hw/xfree86/x86emu/x86emu/types.h | 2 +- hw/xfree86/x86emu/x86emu/x86emui.h | 2 +- hw/xfree86/xaa/XAA.HOWTO | 2 +- hw/xfree86/xaa/xaa.h | 2 +- hw/xfree86/xaa/xaaBitBlt.c | 2 +- hw/xfree86/xaa/xaaBitOrder.c | 2 +- hw/xfree86/xaa/xaaBitmap.c | 2 +- hw/xfree86/xaa/xaaCpyArea.c | 2 +- hw/xfree86/xaa/xaaCpyPlane.c | 2 +- hw/xfree86/xaa/xaaCpyWin.c | 2 +- hw/xfree86/xaa/xaaDashLine.c | 2 +- hw/xfree86/xaa/xaaFallback.c | 2 +- hw/xfree86/xaa/xaaFillArc.c | 2 +- hw/xfree86/xaa/xaaFillPoly.c | 2 +- hw/xfree86/xaa/xaaFillRect.c | 2 +- hw/xfree86/xaa/xaaGC.c | 2 +- hw/xfree86/xaa/xaaGCmisc.c | 2 +- hw/xfree86/xaa/xaaImage.c | 2 +- hw/xfree86/xaa/xaaInit.c | 2 +- hw/xfree86/xaa/xaaInitAccel.c | 2 +- hw/xfree86/xaa/xaaLine.c | 2 +- hw/xfree86/xaa/xaaLineMisc.c | 2 +- hw/xfree86/xaa/xaaNonTEGlyph.c | 2 +- hw/xfree86/xaa/xaaNonTEText.c | 2 +- hw/xfree86/xaa/xaaOffscreen.c | 2 +- hw/xfree86/xaa/xaaOverlay.c | 2 +- hw/xfree86/xaa/xaaOverlayDF.c | 2 +- hw/xfree86/xaa/xaaPCache.c | 2 +- hw/xfree86/xaa/xaaPaintWin.c | 2 +- hw/xfree86/xaa/xaaPict.c | 2 +- hw/xfree86/xaa/xaaROP.c | 2 +- hw/xfree86/xaa/xaaRect.c | 2 +- hw/xfree86/xaa/xaaSpans.c | 2 +- hw/xfree86/xaa/xaaStateChange.c | 2 +- hw/xfree86/xaa/xaaStipple.c | 2 +- hw/xfree86/xaa/xaaTEGlyph.c | 2 +- hw/xfree86/xaa/xaaTEGlyphBlt.S | 2 +- hw/xfree86/xaa/xaaTEText.c | 2 +- hw/xfree86/xaa/xaaTables.c | 2 +- hw/xfree86/xaa/xaaWideLine.c | 2 +- hw/xfree86/xaa/xaacexp.h | 2 +- hw/xfree86/xaa/xaalocal.h | 2 +- hw/xfree86/xaa/xaarop.h | 2 +- hw/xfree86/xaa/xaawrap.h | 2 +- hw/xfree86/xf1bpp/mfbmap.h | 2 +- hw/xfree86/xf1bpp/mfbmap.sh | 2 +- hw/xfree86/xf1bpp/mfbunmap.h | 2 +- hw/xfree86/xf1bpp/mfbunmap.sh | 2 +- hw/xfree86/xf4bpp/NOTES | 2 +- hw/xfree86/xf4bpp/OScompiler.h | 2 +- hw/xfree86/xf4bpp/emulOpStip.c | 2 +- hw/xfree86/xf4bpp/emulRepAre.c | 2 +- hw/xfree86/xf4bpp/emulTile.c | 2 +- hw/xfree86/xf4bpp/ibmTrace.h | 2 +- hw/xfree86/xf4bpp/mfbbres.c | 2 +- hw/xfree86/xf4bpp/mfbbresd.c | 2 +- hw/xfree86/xf4bpp/mfbfillarc.c | 2 +- hw/xfree86/xf4bpp/mfbhrzvert.c | 2 +- hw/xfree86/xf4bpp/mfbimggblt.c | 2 +- hw/xfree86/xf4bpp/mfbline.c | 2 +- hw/xfree86/xf4bpp/mfbzerarc.c | 2 +- hw/xfree86/xf4bpp/offscreen.c | 2 +- hw/xfree86/xf4bpp/ppcArea.c | 2 +- hw/xfree86/xf4bpp/ppcBStore.c | 2 +- hw/xfree86/xf4bpp/ppcCReduce.c | 2 +- hw/xfree86/xf4bpp/ppcClip.c | 2 +- hw/xfree86/xf4bpp/ppcCpArea.c | 2 +- hw/xfree86/xf4bpp/ppcDepth.c | 2 +- hw/xfree86/xf4bpp/ppcFillRct.c | 2 +- hw/xfree86/xf4bpp/ppcGC.c | 2 +- hw/xfree86/xf4bpp/ppcGCstr.h | 2 +- hw/xfree86/xf4bpp/ppcGetSp.c | 2 +- hw/xfree86/xf4bpp/ppcIO.c | 2 +- hw/xfree86/xf4bpp/ppcImg.c | 2 +- hw/xfree86/xf4bpp/ppcPixFS.c | 2 +- hw/xfree86/xf4bpp/ppcPixmap.c | 2 +- hw/xfree86/xf4bpp/ppcPntWin.c | 2 +- hw/xfree86/xf4bpp/ppcPolyPnt.c | 2 +- hw/xfree86/xf4bpp/ppcPolyRec.c | 2 +- hw/xfree86/xf4bpp/ppcQuery.c | 2 +- hw/xfree86/xf4bpp/ppcRslvC.c | 2 +- hw/xfree86/xf4bpp/ppcSetSp.c | 2 +- hw/xfree86/xf4bpp/ppcSpMcro.h | 2 +- hw/xfree86/xf4bpp/ppcWinFS.c | 2 +- hw/xfree86/xf4bpp/ppcWindow.c | 2 +- hw/xfree86/xf4bpp/vgaBitBlt.c | 2 +- hw/xfree86/xf4bpp/vgaGC.c | 2 +- hw/xfree86/xf4bpp/vgaImages.c | 2 +- hw/xfree86/xf4bpp/vgaReg.h | 2 +- hw/xfree86/xf4bpp/vgaSolid.c | 2 +- hw/xfree86/xf4bpp/vgaStipple.c | 2 +- hw/xfree86/xf4bpp/vgaVideo.h | 2 +- hw/xfree86/xf4bpp/wm3.c | 2 +- hw/xfree86/xf4bpp/wm3.h | 2 +- hw/xfree86/xf4bpp/xf4bpp.h | 2 +- hw/xfree86/xf8_16bpp/cfb8_16.h | 2 +- hw/xfree86/xf8_16bpp/cfb8_16module.c | 2 +- hw/xfree86/xf8_16bpp/cfbscrinit.c | 2 +- hw/xfree86/xf8_16bpp/cfbwindow.c | 2 +- hw/xfree86/xf8_32bpp/cfb8_32.h | 2 +- hw/xfree86/xf8_32bpp/cfb8_32module.c | 2 +- hw/xfree86/xf8_32bpp/cfbbstore.c | 2 +- hw/xfree86/xf8_32bpp/cfbcpyarea.c | 2 +- hw/xfree86/xf8_32bpp/cfbcpyplane.c | 2 +- hw/xfree86/xf8_32bpp/cfbgc.c | 2 +- hw/xfree86/xf8_32bpp/cfbgcmisc.c | 2 +- hw/xfree86/xf8_32bpp/cfbgcunder.c | 2 +- hw/xfree86/xf8_32bpp/cfbimage.c | 2 +- hw/xfree86/xf8_32bpp/cfbpntwin.c | 2 +- hw/xfree86/xf8_32bpp/cfbscrinit.c | 2 +- hw/xfree86/xf8_32bpp/cfbwindow.c | 2 +- hw/xfree86/xf8_32bpp/xf86overlay.c | 2 +- hw/xfree86/xf8_32wid/cfb8_32wid.h | 2 +- hw/xfree86/xf8_32wid/cfb8_32widmodule.c | 2 +- hw/xfree86/xf8_32wid/cfbscrinit.c | 2 +- hw/xfree86/xf8_32wid/cfbwid.c | 2 +- hw/xfree86/xf8_32wid/cfbwindow.c | 2 +- hw/xnest/Args.c | 2 +- hw/xnest/Args.h | 2 +- hw/xnest/Color.c | 2 +- hw/xnest/Color.h | 2 +- hw/xnest/Cursor.c | 2 +- hw/xnest/Display.c | 2 +- hw/xnest/Display.h | 2 +- hw/xnest/Drawable.h | 2 +- hw/xnest/Events.c | 2 +- hw/xnest/Events.h | 2 +- hw/xnest/Font.c | 2 +- hw/xnest/GC.c | 2 +- hw/xnest/GCOps.c | 2 +- hw/xnest/GCOps.h | 2 +- hw/xnest/GetTime.c | 2 +- hw/xnest/Handlers.c | 2 +- hw/xnest/Handlers.h | 2 +- hw/xnest/Init.c | 2 +- hw/xnest/Keyboard.c | 2 +- hw/xnest/Keyboard.h | 2 +- hw/xnest/Pixmap.c | 2 +- hw/xnest/Pointer.c | 2 +- hw/xnest/Pointer.h | 2 +- hw/xnest/Screen.c | 2 +- hw/xnest/Screen.h | 2 +- hw/xnest/TestExt.c | 2 +- hw/xnest/Visual.c | 2 +- hw/xnest/Visual.h | 2 +- hw/xnest/Window.c | 2 +- hw/xnest/XNCursor.h | 2 +- hw/xnest/XNFont.h | 2 +- hw/xnest/XNGC.h | 2 +- hw/xnest/XNPixmap.h | 2 +- hw/xnest/XNWindow.h | 2 +- hw/xnest/Xnest.h | 2 +- hw/xnest/Xnest.man.pre | 2 +- hw/xnest/os2Stub.c | 2 +- hw/xwin/InitInput.c | 2 +- hw/xwin/InitOutput.c | 2 +- hw/xwin/XWin.man | 2 +- hw/xwin/XWin.rc | 2 +- hw/xwin/ddraw.h | 2 +- hw/xwin/win.h | 2 +- hw/xwin/winallpriv.c | 2 +- hw/xwin/winblock.c | 2 +- hw/xwin/winclip.c | 2 +- hw/xwin/winclipboard.h | 2 +- hw/xwin/winclipboardinit.c | 2 +- hw/xwin/winclipboardtextconv.c | 2 +- hw/xwin/winclipboardthread.c | 2 +- hw/xwin/winclipboardunicode.c | 2 +- hw/xwin/winclipboardwndproc.c | 2 +- hw/xwin/winclipboardxevents.c | 2 +- hw/xwin/wincmap.c | 2 +- hw/xwin/winconfig.c | 2 +- hw/xwin/winconfig.h | 2 +- hw/xwin/wincreatewnd.c | 2 +- hw/xwin/wincursor.c | 2 +- hw/xwin/windialogs.c | 2 +- hw/xwin/winengine.c | 2 +- hw/xwin/winerror.c | 2 +- hw/xwin/winfillsp.c | 2 +- hw/xwin/winfont.c | 2 +- hw/xwin/wingc.c | 2 +- hw/xwin/wingetsp.c | 2 +- hw/xwin/winkeybd.c | 2 +- hw/xwin/winkeybd.h | 2 +- hw/xwin/winmisc.c | 2 +- hw/xwin/winmouse.c | 2 +- hw/xwin/winms.h | 2 +- hw/xwin/winmsg.c | 2 +- hw/xwin/winmsg.h | 2 +- hw/xwin/winmultiwindowclass.c | 2 +- hw/xwin/winmultiwindowclass.h | 2 +- hw/xwin/winmultiwindowicons.c | 2 +- hw/xwin/winmultiwindowshape.c | 2 +- hw/xwin/winmultiwindowwindow.c | 2 +- hw/xwin/winmultiwindowwm.c | 2 +- hw/xwin/winmultiwindowwndproc.c | 2 +- hw/xwin/winnativegdi.c | 2 +- hw/xwin/winpfbdd.c | 2 +- hw/xwin/winpixmap.c | 2 +- hw/xwin/winpntwin.c | 2 +- hw/xwin/winpolyline.c | 2 +- hw/xwin/winprefs.c | 2 +- hw/xwin/winprefs.h | 2 +- hw/xwin/winprefslex.l | 2 +- hw/xwin/winprefsyacc.y | 2 +- hw/xwin/winpushpxl.c | 2 +- hw/xwin/winregistry.c | 2 +- hw/xwin/winrop.c | 2 +- hw/xwin/winscrinit.c | 2 +- hw/xwin/winsetsp.c | 2 +- hw/xwin/winshaddd.c | 2 +- hw/xwin/winshadddnl.c | 2 +- hw/xwin/winshadgdi.c | 2 +- hw/xwin/wintrayicon.c | 2 +- hw/xwin/winvideo.c | 2 +- hw/xwin/winwakeup.c | 2 +- hw/xwin/winwindow.c | 2 +- hw/xwin/winwindow.h | 2 +- hw/xwin/winwndproc.c | 2 +- ilbm/ilbm.h | 2 +- ilbm/ilbmbitblt.c | 2 +- ilbm/ilbmblt.c | 2 +- ilbm/ilbmbres.c | 2 +- ilbm/ilbmbresd.c | 2 +- ilbm/ilbmbstore.c | 2 +- ilbm/ilbmclip.c | 2 +- ilbm/ilbmcmap.c | 2 +- ilbm/ilbmfillarc.c | 2 +- ilbm/ilbmfillrct.c | 2 +- ilbm/ilbmfillsp.c | 2 +- ilbm/ilbmfont.c | 2 +- ilbm/ilbmgc.c | 2 +- ilbm/ilbmgetsp.c | 2 +- ilbm/ilbmhrzvert.c | 2 +- ilbm/ilbmimage.c | 2 +- ilbm/ilbmimggblt.c | 2 +- ilbm/ilbmline.c | 2 +- ilbm/ilbmmisc.c | 2 +- ilbm/ilbmpixmap.c | 2 +- ilbm/ilbmply1rct.c | 2 +- ilbm/ilbmplygblt.c | 2 +- ilbm/ilbmpntarea.c | 2 +- ilbm/ilbmpntwin.c | 2 +- ilbm/ilbmpolypnt.c | 2 +- ilbm/ilbmpushpxl.c | 2 +- ilbm/ilbmscrinit.c | 2 +- ilbm/ilbmsetsp.c | 2 +- ilbm/ilbmtegblt.c | 2 +- ilbm/ilbmtile.c | 2 +- ilbm/ilbmwindow.c | 2 +- ilbm/ilbmzerarc.c | 2 +- include/XIstubs.h | 2 +- include/bstore.h | 2 +- include/bstorestr.h | 2 +- include/closestr.h | 2 +- include/colormap.h | 2 +- include/cursor.h | 2 +- include/cursorstr.h | 2 +- include/dix.h | 2 +- include/dixevents.h | 2 +- include/dixfont.h | 2 +- include/dixgrabs.h | 2 +- include/dixstruct.h | 2 +- include/exevents.h | 2 +- include/extension.h | 2 +- include/extinit.h | 2 +- include/extnsionst.h | 2 +- include/gc.h | 2 +- include/gcstruct.h | 2 +- include/globals.h | 2 +- include/input.h | 2 +- include/inputstr.h | 2 +- include/misc.h | 2 +- include/miscstruct.h | 2 +- include/opaque.h | 2 +- include/os.h | 2 +- include/pixmap.h | 2 +- include/pixmapstr.h | 2 +- include/property.h | 2 +- include/propertyst.h | 2 +- include/regionstr.h | 2 +- include/resource.h | 2 +- include/screenint.h | 2 +- include/scrnintstr.h | 2 +- include/servermd.h | 2 +- include/site.h | 2 +- include/swaprep.h | 2 +- include/swapreq.h | 2 +- include/validate.h | 2 +- include/window.h | 2 +- include/windowstr.h | 2 +- iplan2p4/ipl.h | 2 +- iplan2p4/iplallpriv.c | 2 +- iplan2p4/iplbitblt.c | 2 +- iplan2p4/iplblt.c | 2 +- iplan2p4/iplbres.c | 2 +- iplan2p4/iplbresd.c | 2 +- iplan2p4/iplbstore.c | 2 +- iplan2p4/iplcmap.c | 2 +- iplan2p4/iplfillarc.c | 2 +- iplan2p4/iplfillrct.c | 2 +- iplan2p4/iplfillsp.c | 2 +- iplan2p4/iplgc.c | 2 +- iplan2p4/iplgetsp.c | 2 +- iplan2p4/iplhrzvert.c | 2 +- iplan2p4/iplimage.c | 2 +- iplan2p4/iplline.c | 2 +- iplan2p4/iplmap.h | 2 +- iplan2p4/iplmergerop.h | 2 +- iplan2p4/iplmskbits.c | 2 +- iplan2p4/iplmskbits.h | 2 +- iplan2p4/iplpack.c | 2 +- iplan2p4/iplpack.h | 2 +- iplan2p4/iplpixmap.c | 2 +- iplan2p4/iplply1rct.c | 2 +- iplan2p4/iplpntwin.c | 2 +- iplan2p4/iplpolypnt.c | 2 +- iplan2p4/iplrrop.c | 2 +- iplan2p4/iplrrop.h | 2 +- iplan2p4/iplscrinit.c | 2 +- iplan2p4/iplsetsp.c | 2 +- iplan2p4/iplsolid.c | 2 +- iplan2p4/ipltegblt.c | 2 +- iplan2p4/ipltile32.c | 2 +- iplan2p4/ipltileodd.c | 2 +- iplan2p4/iplwindow.c | 2 +- lbx/lbxcmap.c | 2 +- lbx/lbxdix.c | 2 +- lbx/lbxexts.c | 2 +- lbx/lbxgfx.c | 2 +- lbx/lbxmain.c | 2 +- lbx/lbxopts.c | 2 +- lbx/lbxprop.c | 2 +- lbx/lbxserve.h | 2 +- lbx/lbxsquish.c | 2 +- lbx/lbxsrvopts.h | 2 +- lbx/lbxswap.c | 2 +- lbx/lbxtables.c | 2 +- lbx/lbxtags.c | 2 +- lbx/lbxtags.h | 2 +- lbx/lbxzerorep.c | 2 +- mfb/fastblt.h | 2 +- mfb/maskbits.c | 2 +- mfb/maskbits.h | 2 +- mfb/mergerop.h | 2 +- mfb/mfb.h | 2 +- mfb/mfbbitblt.c | 2 +- mfb/mfbblt.c | 2 +- mfb/mfbbres.c | 2 +- mfb/mfbbresd.c | 2 +- mfb/mfbclip.c | 2 +- mfb/mfbcmap.c | 2 +- mfb/mfbfillarc.c | 2 +- mfb/mfbfillrct.c | 2 +- mfb/mfbfillsp.c | 2 +- mfb/mfbgc.c | 2 +- mfb/mfbgetsp.c | 2 +- mfb/mfbhrzvert.c | 2 +- mfb/mfbimage.c | 2 +- mfb/mfbimggblt.c | 2 +- mfb/mfbline.c | 2 +- mfb/mfbply1rct.c | 2 +- mfb/mfbplygblt.c | 2 +- mfb/mfbpolypnt.c | 2 +- mfb/mfbpushpxl.c | 2 +- mfb/mfbscrclse.c | 2 +- mfb/mfbscrinit.c | 2 +- mfb/mfbsetsp.c | 2 +- mfb/mfbtegblt.c | 2 +- mfb/mfbtile.c | 2 +- mfb/mfbwindow.c | 2 +- mfb/mfbzerarc.c | 2 +- mi/cbrt.c | 2 +- mi/mi.h | 2 +- mi/miarc.c | 2 +- mi/mibank.c | 2 +- mi/mibank.h | 2 +- mi/mibitblt.c | 2 +- mi/mibstore.c | 2 +- mi/mibstore.h | 2 +- mi/mibstorest.h | 2 +- mi/miclipn.c | 2 +- mi/micmap.c | 2 +- mi/micmap.h | 2 +- mi/micursor.c | 2 +- mi/midash.c | 2 +- mi/midispcur.c | 2 +- mi/mieq.c | 2 +- mi/miexpose.c | 2 +- mi/mifillarc.c | 2 +- mi/mifillarc.h | 2 +- mi/mifillrct.c | 2 +- mi/mifpoly.h | 2 +- mi/mifpolycon.c | 2 +- mi/migc.c | 2 +- mi/migc.h | 2 +- mi/miglblt.c | 2 +- mi/miinitext.c | 2 +- mi/miline.h | 2 +- mi/mioverlay.c | 2 +- mi/mioverlay.h | 2 +- mi/mipointer.c | 2 +- mi/mipointer.h | 2 +- mi/mipointrst.h | 2 +- mi/mipoly.c | 2 +- mi/mipoly.h | 2 +- mi/mipolycon.c | 2 +- mi/mipolygen.c | 2 +- mi/mipolypnt.c | 2 +- mi/mipolyrect.c | 2 +- mi/mipolyseg.c | 2 +- mi/mipolytext.c | 2 +- mi/mipolyutil.c | 2 +- mi/mipushpxl.c | 2 +- mi/miregion.c | 2 +- mi/miscrinit.c | 2 +- mi/mispans.c | 2 +- mi/mispans.h | 2 +- mi/misprite.c | 2 +- mi/misprite.h | 2 +- mi/mispritest.h | 2 +- mi/mistruct.h | 2 +- mi/mivalidate.h | 2 +- mi/mivaltree.c | 2 +- mi/miwideline.c | 2 +- mi/miwideline.h | 2 +- mi/miwindow.c | 2 +- mi/mizerarc.c | 2 +- mi/mizerarc.h | 2 +- mi/mizerclip.c | 2 +- mi/mizerline.c | 2 +- miext/layer/layer.h | 2 +- miext/layer/layergc.c | 2 +- miext/layer/layerinit.c | 2 +- miext/layer/layerpict.c | 2 +- miext/layer/layerstr.h | 2 +- miext/layer/layerwin.c | 2 +- miext/rootless/accel/rlAccel.h | 2 +- miext/rootless/accel/rlBlt.c | 2 +- miext/rootless/accel/rlCopy.c | 2 +- miext/rootless/accel/rlFill.c | 2 +- miext/rootless/accel/rlFillRect.c | 2 +- miext/rootless/accel/rlFillSpans.c | 2 +- miext/rootless/accel/rlGlyph.c | 2 +- miext/rootless/accel/rlSolid.c | 2 +- miext/rootless/rootless.h | 2 +- miext/rootless/rootlessCommon.c | 2 +- miext/rootless/rootlessCommon.h | 2 +- miext/rootless/rootlessConfig.h | 2 +- miext/rootless/rootlessGC.c | 2 +- miext/rootless/rootlessScreen.c | 2 +- miext/rootless/rootlessValTree.c | 2 +- miext/rootless/rootlessWindow.c | 2 +- miext/rootless/rootlessWindow.h | 2 +- miext/rootless/safeAlpha/safeAlpha.h | 2 +- miext/rootless/safeAlpha/safeAlphaPicture.c | 2 +- miext/rootless/safeAlpha/safeAlphaWindow.c | 2 +- miext/shadow/shadow.c | 2 +- miext/shadow/shadow.h | 2 +- miext/shadow/shalloc.c | 2 +- miext/shadow/shpacked.c | 2 +- miext/shadow/shplanar.c | 2 +- miext/shadow/shplanar8.c | 2 +- miext/shadow/shrot16pack.c | 2 +- miext/shadow/shrot16pack_180.c | 2 +- miext/shadow/shrot16pack_270.c | 2 +- miext/shadow/shrot16pack_90.c | 2 +- miext/shadow/shrot32pack.c | 2 +- miext/shadow/shrot32pack_180.c | 2 +- miext/shadow/shrot32pack_270.c | 2 +- miext/shadow/shrot32pack_90.c | 2 +- miext/shadow/shrot8pack.c | 2 +- miext/shadow/shrot8pack_180.c | 2 +- miext/shadow/shrot8pack_270.c | 2 +- miext/shadow/shrot8pack_90.c | 2 +- miext/shadow/shrotate.c | 2 +- miext/shadow/shrotpack.h | 2 +- os/WaitFor.c | 2 +- os/access.c | 2 +- os/auth.c | 2 +- os/connection.c | 2 +- os/io.c | 2 +- os/k5auth.c | 2 +- os/lbxio.c | 2 +- os/mitauth.c | 2 +- os/oscolor.c | 2 +- os/osdep.h | 2 +- os/osinit.c | 2 +- os/rpcauth.c | 2 +- os/secauth.c | 2 +- os/strlcat.c | 2 +- os/strlcpy.c | 2 +- os/utils.c | 2 +- os/xalloc.c | 2 +- os/xdmauth.c | 2 +- os/xdmcp.c | 2 +- randr/mirandr.c | 2 +- randr/randr.c | 2 +- randr/randrstr.h | 2 +- record/record.c | 2 +- record/set.c | 2 +- record/set.h | 2 +- render/animcur.c | 2 +- render/filter.c | 2 +- render/glyph.c | 2 +- render/glyphstr.h | 2 +- render/miglyph.c | 2 +- render/miindex.c | 2 +- render/mipict.c | 2 +- render/mipict.h | 2 +- render/mirect.c | 2 +- render/mitrap.c | 2 +- render/mitri.c | 2 +- render/picture.c | 2 +- render/picture.h | 2 +- render/picturestr.h | 2 +- render/render.c | 2 +- xkb/XKBAlloc.c | 2 +- xkb/XKBGAlloc.c | 2 +- xkb/XKBMAlloc.c | 2 +- xkb/XKBMisc.c | 2 +- xkb/ddxBeep.c | 2 +- xkb/ddxConfig.c | 2 +- xkb/ddxCtrls.c | 2 +- xkb/ddxDevBtn.c | 2 +- xkb/ddxFakeBtn.c | 2 +- xkb/ddxFakeMtn.c | 2 +- xkb/ddxInit.c | 2 +- xkb/ddxKeyClick.c | 2 +- xkb/ddxKillSrv.c | 2 +- xkb/ddxLEDs.c | 2 +- xkb/ddxList.c | 2 +- xkb/ddxLoad.c | 2 +- xkb/ddxPrivate.c | 2 +- xkb/ddxVT.c | 2 +- xkb/maprules.c | 2 +- xkb/xkb.c | 2 +- xkb/xkb.h | 2 +- xkb/xkbAccessX.c | 2 +- xkb/xkbActions.c | 2 +- xkb/xkbDflts.h | 2 +- xkb/xkbEvents.c | 2 +- xkb/xkbInit.c | 2 +- xkb/xkbLEDs.c | 2 +- xkb/xkbPrKeyEv.c | 2 +- xkb/xkbPrOtherEv.c | 2 +- xkb/xkbSwap.c | 2 +- xkb/xkbUtils.c | 2 +- xkb/xkbconfig.c | 2 +- xkb/xkberrs.c | 2 +- xkb/xkbfmisc.c | 2 +- xkb/xkbout.c | 2 +- xkb/xkbtext.c | 2 +- xkb/xkmread.c | 2 +- 1323 files changed, 1586 insertions(+), 1623 deletions(-) diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c index 106a6464d7..ae3276a026 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.2 2003/09/16 00:36:11 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ #include "quartzCommon.h" #include diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c index c4d235a477..b1292b6064 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.2 2003/09/16 00:36:11 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */ #include "dri.h" #include "quartz.h" diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c index 12d1abe569..47988a5957 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.5 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */ /* 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 25c233ac75..e311d98c38 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.4 2003/09/28 20:15:42 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* 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 1fe07f40e9..472a2d443e 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.5 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */ /* 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 89184c1b66..3aca9347fa 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.5 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */ /* 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 a599423cc7..d351dc1bec 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.8 2004/02/03 21:34:36 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.10 2004/03/10 18:08:01 tsi Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are @@ -68,11 +68,21 @@ void __glXDisp_Begin(GLbyte *pc) #define __GLX_SWAP_GLdouble(ptr) __GLX_SWAP_DOUBLE(ptr) #define __GLX_SWAP_GLfloat(ptr) __GLX_SWAP_FLOAT(ptr) -#define __GLX_SWAP_GLbyte_ARRAY(ptr,count) (void) swapEnd; (void) swapPC; (void) sw; +#define __GLX_DECLARE_SWAP_GLbyte_ARRAY +#define __GLX_DECLARE_SWAP_GLshort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES +#define __GLX_DECLARE_SWAP_GLint_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES +#define __GLX_DECLARE_SWAP_GLenum_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES +#define __GLX_DECLARE_SWAP_GLubyte_ARRAY +#define __GLX_DECLARE_SWAP_GLushort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES +#define __GLX_DECLARE_SWAP_GLuint_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES +#define __GLX_DECLARE_SWAP_GLdouble_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES +#define __GLX_DECLARE_SWAP_GLfloat_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES + +#define __GLX_SWAP_GLbyte_ARRAY(ptr,count) #define __GLX_SWAP_GLshort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count) #define __GLX_SWAP_GLint_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count) #define __GLX_SWAP_GLenum_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count) -#define __GLX_SWAP_GLubyte_ARRAY(ptr,count) (void) swapEnd; (void) swapPC; (void) sw; +#define __GLX_SWAP_GLubyte_ARRAY(ptr,count) #define __GLX_SWAP_GLushort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count) #define __GLX_SWAP_GLuint_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count) #define __GLX_SWAP_GLdouble_ARRAY(ptr,count) __GLX_SWAP_DOUBLE_ARRAY(ptr,count) @@ -115,28 +125,12 @@ void __glXDisp_Begin(GLbyte *pc) } \ void __glXDispSwap_ ## name ( GLbyte * pc ) \ { \ - __GLX_DECLARE_SWAP_VARIABLES; \ - __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \ + __GLX_DECLARE_SWAP_ ## type ## _ARRAY; \ GLX_DO_ALIGN_MAGIC( 3, type ); \ __GLX_SWAP_ ## type ## _ARRAY(pc, 3); \ gl ## name ( (type *) pc ); \ } -#define dispatch_template_4( name, type ) \ - void __glXDisp_ ## name ( GLbyte * pc ) \ - { \ - GLX_DO_ALIGN_MAGIC( 4, type ); \ - gl ## name ( (type *) pc ); \ - } \ - void __glXDispSwap_ ## name ( GLbyte * pc ) \ - { \ - __GLX_DECLARE_SWAP_VARIABLES; \ - __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \ - GLX_DO_ALIGN_MAGIC( 4, type ); \ - __GLX_SWAP_ ## type ## _ARRAY(pc, 4); \ - gl ## name ( (type *) pc ); \ - } - #define dispatch_template_4s( name, type ) \ void __glXDisp_ ## name ( GLbyte * pc ) \ { \ @@ -146,8 +140,7 @@ void __glXDisp_Begin(GLbyte *pc) } \ void __glXDispSwap_ ## name ( GLbyte * pc ) \ { \ - __GLX_DECLARE_SWAP_VARIABLES; \ - __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \ + __GLX_DECLARE_SWAP_ ##type ## _ARRAY; \ GLX_DO_ALIGN_MAGIC( 4, type ); \ __GLX_SWAP_ ## type ## _ARRAY(pc, 4); \ gl ## name ( ((type *) pc)[0], ((type *) pc)[1], \ @@ -184,8 +177,7 @@ void __glXDisp_Begin(GLbyte *pc) void __glXDispSwap_ ## name ( GLbyte * pc ) \ { \ GLenum pname; GLint compsize; \ - __GLX_DECLARE_SWAP_VARIABLES; \ - __GLX_DECLARE_SWAP_ARRAY_VARIABLES; \ + __GLX_DECLARE_SWAP_ ## type ## _ARRAY; \ __GLX_SWAP_INT(pc + 0); \ pname = *(GLenum *)(pc + 0); \ compsize = __gl ## name ## _size(pname); \ diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c index 2a8d0c02f7..e849405dbf 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.8 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.10 2004/03/10 18:08:01 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -79,7 +79,6 @@ void __glXDispSwap_Color3bv(GLbyte *pc) void __glXDispSwap_Color3dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -97,7 +96,6 @@ void __glXDispSwap_Color3dv(GLbyte *pc) void __glXDispSwap_Color3fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3); @@ -109,7 +107,6 @@ void __glXDispSwap_Color3fv(GLbyte *pc) void __glXDispSwap_Color3iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 3); @@ -121,7 +118,6 @@ void __glXDispSwap_Color3iv(GLbyte *pc) void __glXDispSwap_Color3sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 3); @@ -140,7 +136,6 @@ void __glXDispSwap_Color3ubv(GLbyte *pc) void __glXDispSwap_Color3uiv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 3); @@ -152,7 +147,6 @@ void __glXDispSwap_Color3uiv(GLbyte *pc) void __glXDispSwap_Color3usv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 3); @@ -171,7 +165,6 @@ void __glXDispSwap_Color4bv(GLbyte *pc) void __glXDispSwap_Color4dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; @@ -190,7 +183,6 @@ void __glXDispSwap_Color4dv(GLbyte *pc) void __glXDispSwap_Color4fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4); @@ -202,7 +194,6 @@ void __glXDispSwap_Color4fv(GLbyte *pc) void __glXDispSwap_Color4iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 4); @@ -214,7 +205,6 @@ void __glXDispSwap_Color4iv(GLbyte *pc) void __glXDispSwap_Color4sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 4); @@ -233,7 +223,6 @@ void __glXDispSwap_Color4ubv(GLbyte *pc) void __glXDispSwap_Color4uiv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 4); @@ -245,7 +234,6 @@ void __glXDispSwap_Color4uiv(GLbyte *pc) void __glXDispSwap_Color4usv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 4); @@ -270,7 +258,6 @@ void __glXDispSwap_End(GLbyte *pc) void __glXDispSwap_Indexdv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -288,7 +275,6 @@ void __glXDispSwap_Indexdv(GLbyte *pc) void __glXDispSwap_Indexfv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 1); @@ -300,7 +286,6 @@ void __glXDispSwap_Indexfv(GLbyte *pc) void __glXDispSwap_Indexiv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 1); @@ -312,7 +297,6 @@ void __glXDispSwap_Indexiv(GLbyte *pc) void __glXDispSwap_Indexsv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 1); @@ -331,7 +315,6 @@ void __glXDispSwap_Normal3bv(GLbyte *pc) void __glXDispSwap_Normal3dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -349,7 +332,6 @@ void __glXDispSwap_Normal3dv(GLbyte *pc) void __glXDispSwap_Normal3fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3); @@ -361,7 +343,6 @@ void __glXDispSwap_Normal3fv(GLbyte *pc) void __glXDispSwap_Normal3iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 3); @@ -373,7 +354,6 @@ void __glXDispSwap_Normal3iv(GLbyte *pc) void __glXDispSwap_Normal3sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 3); @@ -385,7 +365,6 @@ void __glXDispSwap_Normal3sv(GLbyte *pc) void __glXDispSwap_RasterPos2dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -403,7 +382,6 @@ void __glXDispSwap_RasterPos2dv(GLbyte *pc) void __glXDispSwap_RasterPos2fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2); @@ -415,7 +393,6 @@ void __glXDispSwap_RasterPos2fv(GLbyte *pc) void __glXDispSwap_RasterPos2iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 2); @@ -427,7 +404,6 @@ void __glXDispSwap_RasterPos2iv(GLbyte *pc) void __glXDispSwap_RasterPos2sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 2); @@ -439,7 +415,6 @@ void __glXDispSwap_RasterPos2sv(GLbyte *pc) void __glXDispSwap_RasterPos3dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -457,7 +432,6 @@ void __glXDispSwap_RasterPos3dv(GLbyte *pc) void __glXDispSwap_RasterPos3fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3); @@ -469,7 +443,6 @@ void __glXDispSwap_RasterPos3fv(GLbyte *pc) void __glXDispSwap_RasterPos3iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 3); @@ -481,7 +454,6 @@ void __glXDispSwap_RasterPos3iv(GLbyte *pc) void __glXDispSwap_RasterPos3sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 3); @@ -493,7 +465,6 @@ void __glXDispSwap_RasterPos3sv(GLbyte *pc) void __glXDispSwap_RasterPos4dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -511,7 +482,6 @@ void __glXDispSwap_RasterPos4dv(GLbyte *pc) void __glXDispSwap_RasterPos4fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4); @@ -523,7 +493,6 @@ void __glXDispSwap_RasterPos4fv(GLbyte *pc) void __glXDispSwap_RasterPos4iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 4); @@ -535,7 +504,6 @@ void __glXDispSwap_RasterPos4iv(GLbyte *pc) void __glXDispSwap_RasterPos4sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 4); @@ -547,7 +515,6 @@ void __glXDispSwap_RasterPos4sv(GLbyte *pc) void __glXDispSwap_Rectdv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -567,7 +534,6 @@ void __glXDispSwap_Rectdv(GLbyte *pc) void __glXDispSwap_Rectfv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2); @@ -581,7 +547,6 @@ void __glXDispSwap_Rectfv(GLbyte *pc) void __glXDispSwap_Rectiv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 2); @@ -595,7 +560,6 @@ void __glXDispSwap_Rectiv(GLbyte *pc) void __glXDispSwap_Rectsv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 2); @@ -609,7 +573,6 @@ void __glXDispSwap_Rectsv(GLbyte *pc) void __glXDispSwap_TexCoord1dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -627,7 +590,6 @@ void __glXDispSwap_TexCoord1dv(GLbyte *pc) void __glXDispSwap_TexCoord1fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 1); @@ -639,7 +601,6 @@ void __glXDispSwap_TexCoord1fv(GLbyte *pc) void __glXDispSwap_TexCoord1iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 1); @@ -651,7 +612,6 @@ void __glXDispSwap_TexCoord1iv(GLbyte *pc) void __glXDispSwap_TexCoord1sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 1); @@ -663,7 +623,6 @@ void __glXDispSwap_TexCoord1sv(GLbyte *pc) void __glXDispSwap_TexCoord2dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -681,7 +640,6 @@ void __glXDispSwap_TexCoord2dv(GLbyte *pc) void __glXDispSwap_TexCoord2fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2); @@ -693,7 +651,6 @@ void __glXDispSwap_TexCoord2fv(GLbyte *pc) void __glXDispSwap_TexCoord2iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 2); @@ -705,7 +662,6 @@ void __glXDispSwap_TexCoord2iv(GLbyte *pc) void __glXDispSwap_TexCoord2sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 2); @@ -717,7 +673,6 @@ void __glXDispSwap_TexCoord2sv(GLbyte *pc) void __glXDispSwap_TexCoord3dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -735,7 +690,6 @@ void __glXDispSwap_TexCoord3dv(GLbyte *pc) void __glXDispSwap_TexCoord3fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3); @@ -747,7 +701,6 @@ void __glXDispSwap_TexCoord3fv(GLbyte *pc) void __glXDispSwap_TexCoord3iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 3); @@ -759,7 +712,6 @@ void __glXDispSwap_TexCoord3iv(GLbyte *pc) void __glXDispSwap_TexCoord3sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 3); @@ -771,7 +723,6 @@ void __glXDispSwap_TexCoord3sv(GLbyte *pc) void __glXDispSwap_TexCoord4dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -789,7 +740,6 @@ void __glXDispSwap_TexCoord4dv(GLbyte *pc) void __glXDispSwap_TexCoord4fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4); @@ -801,7 +751,6 @@ void __glXDispSwap_TexCoord4fv(GLbyte *pc) void __glXDispSwap_TexCoord4iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 4); @@ -813,7 +762,6 @@ void __glXDispSwap_TexCoord4iv(GLbyte *pc) void __glXDispSwap_TexCoord4sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 4); @@ -825,7 +773,6 @@ void __glXDispSwap_TexCoord4sv(GLbyte *pc) void __glXDispSwap_Vertex2dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -843,7 +790,6 @@ void __glXDispSwap_Vertex2dv(GLbyte *pc) void __glXDispSwap_Vertex2fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2); @@ -855,7 +801,6 @@ void __glXDispSwap_Vertex2fv(GLbyte *pc) void __glXDispSwap_Vertex2iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 2); @@ -867,7 +812,6 @@ void __glXDispSwap_Vertex2iv(GLbyte *pc) void __glXDispSwap_Vertex2sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 2); @@ -879,7 +823,6 @@ void __glXDispSwap_Vertex2sv(GLbyte *pc) void __glXDispSwap_Vertex3dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -897,7 +840,6 @@ void __glXDispSwap_Vertex3dv(GLbyte *pc) void __glXDispSwap_Vertex3fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 3); @@ -909,7 +851,6 @@ void __glXDispSwap_Vertex3fv(GLbyte *pc) void __glXDispSwap_Vertex3iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 3); @@ -921,7 +862,6 @@ void __glXDispSwap_Vertex3iv(GLbyte *pc) void __glXDispSwap_Vertex3sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 3); @@ -933,7 +873,6 @@ void __glXDispSwap_Vertex3sv(GLbyte *pc) void __glXDispSwap_Vertex4dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -951,7 +890,6 @@ void __glXDispSwap_Vertex4dv(GLbyte *pc) void __glXDispSwap_Vertex4fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 4); @@ -963,7 +901,6 @@ void __glXDispSwap_Vertex4fv(GLbyte *pc) void __glXDispSwap_Vertex4iv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT_ARRAY(pc + 0, 4); @@ -975,7 +912,6 @@ void __glXDispSwap_Vertex4iv(GLbyte *pc) void __glXDispSwap_Vertex4sv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT_ARRAY(pc + 0, 4); @@ -987,7 +923,6 @@ void __glXDispSwap_Vertex4sv(GLbyte *pc) void __glXDispSwap_ClipPlane(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -1046,7 +981,6 @@ void __glXDispSwap_Fogfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -1078,7 +1012,6 @@ void __glXDispSwap_Fogiv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -1136,7 +1069,6 @@ void __glXDispSwap_Lightfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1172,7 +1104,6 @@ void __glXDispSwap_Lightiv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1206,7 +1137,6 @@ void __glXDispSwap_LightModelfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -1238,7 +1168,6 @@ void __glXDispSwap_LightModeliv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -1296,7 +1225,6 @@ void __glXDispSwap_Materialfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1332,7 +1260,6 @@ void __glXDispSwap_Materialiv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1420,7 +1347,6 @@ void __glXDispSwap_TexParameterfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1456,7 +1382,6 @@ void __glXDispSwap_TexParameteriv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1492,7 +1417,6 @@ void __glXDispSwap_TexEnvfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1528,7 +1452,6 @@ void __glXDispSwap_TexEnviv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1574,7 +1497,6 @@ void __glXDispSwap_TexGendv(GLbyte *pc) GLint cmdlen; #endif GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1618,7 +1540,6 @@ void __glXDispSwap_TexGenfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1654,7 +1575,6 @@ void __glXDispSwap_TexGeniv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -1991,7 +1911,6 @@ void __glXDispSwap_MapGrid2f(GLbyte *pc) void __glXDispSwap_EvalCoord1dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -2009,7 +1928,6 @@ void __glXDispSwap_EvalCoord1dv(GLbyte *pc) void __glXDispSwap_EvalCoord1fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 1); @@ -2021,7 +1939,6 @@ void __glXDispSwap_EvalCoord1fv(GLbyte *pc) void __glXDispSwap_EvalCoord2dv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -2039,7 +1956,6 @@ void __glXDispSwap_EvalCoord2dv(GLbyte *pc) void __glXDispSwap_EvalCoord2fv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 2); @@ -2227,7 +2143,6 @@ void __glXDispSwap_PixelTransferi(GLbyte *pc) void __glXDispSwap_PixelMapfv(GLbyte *pc) { GLint mapsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -2245,7 +2160,6 @@ void __glXDispSwap_PixelMapfv(GLbyte *pc) void __glXDispSwap_PixelMapuiv(GLbyte *pc) { GLint mapsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -2263,7 +2177,6 @@ void __glXDispSwap_PixelMapuiv(GLbyte *pc) void __glXDispSwap_PixelMapusv(GLbyte *pc) { GLint mapsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -2364,7 +2277,6 @@ void __glXDispSwap_LoadIdentity(GLbyte *pc) void __glXDispSwap_LoadMatrixf(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 16); @@ -2376,7 +2288,6 @@ void __glXDispSwap_LoadMatrixf(GLbyte *pc) void __glXDispSwap_LoadMatrixd(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -2405,7 +2316,6 @@ void __glXDispSwap_MatrixMode(GLbyte *pc) void __glXDispSwap_MultMatrixf(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_FLOAT_ARRAY(pc + 0, 16); @@ -2417,7 +2327,6 @@ void __glXDispSwap_MultMatrixf(GLbyte *pc) void __glXDispSwap_MultMatrixd(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -2728,7 +2637,6 @@ void __glXDispSwap_BindTexture(GLbyte *pc) void __glXDispSwap_PrioritizeTextures(GLbyte *pc) { GLsizei n; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -2782,7 +2690,6 @@ void __glXDispSwap_ColorTableParameterfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -2803,7 +2710,6 @@ void __glXDispSwap_ColorTableParameteriv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -2877,7 +2783,6 @@ void __glXDispSwap_ConvolutionParameterfv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -2913,7 +2818,6 @@ void __glXDispSwap_ConvolutionParameteriv(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); @@ -3062,7 +2966,6 @@ void __glXDispSwap_ActiveTextureARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -3082,7 +2985,6 @@ void __glXDispSwap_MultiTexCoord1dvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3096,7 +2998,6 @@ void __glXDispSwap_MultiTexCoord1fvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3110,7 +3011,6 @@ void __glXDispSwap_MultiTexCoord1ivARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3124,7 +3024,6 @@ void __glXDispSwap_MultiTexCoord1svARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -3144,7 +3043,6 @@ void __glXDispSwap_MultiTexCoord2dvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3158,7 +3056,6 @@ void __glXDispSwap_MultiTexCoord2fvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3172,7 +3069,6 @@ void __glXDispSwap_MultiTexCoord2ivARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3186,7 +3082,6 @@ void __glXDispSwap_MultiTexCoord2svARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -3206,7 +3101,6 @@ void __glXDispSwap_MultiTexCoord3dvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3220,7 +3114,6 @@ void __glXDispSwap_MultiTexCoord3fvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3234,7 +3127,6 @@ void __glXDispSwap_MultiTexCoord3ivARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3248,7 +3140,6 @@ void __glXDispSwap_MultiTexCoord3svARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; #ifdef __GLX_ALIGN64 @@ -3268,7 +3159,6 @@ void __glXDispSwap_MultiTexCoord4dvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3282,7 +3172,6 @@ void __glXDispSwap_MultiTexCoord4fvARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3296,7 +3185,6 @@ void __glXDispSwap_MultiTexCoord4ivARB(GLbyte *pc) void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -3330,7 +3218,6 @@ void __glXDispSwap_PointParameterfvARB(GLbyte *pc) { GLenum pname; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); diff --git a/GL/glx/g_single.c b/GL/glx/g_single.c index ce446470f9..5bcec133c2 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.6 2003/10/28 22:50:17 tsi Exp $ */ /* ** 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 71722e57f6..5efcbe535f 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.6 2004/03/10 18:08:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -234,7 +234,6 @@ int __glXDispSwap_GetDoublev(__GLXclientState *cl, GLbyte *pc) int error; GLdouble answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -312,7 +311,6 @@ int __glXDispSwap_GetFloatv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -365,7 +363,6 @@ int __glXDispSwap_GetIntegerv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -418,7 +415,6 @@ int __glXDispSwap_GetLightfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -473,7 +469,6 @@ int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -529,7 +524,6 @@ int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc) int error; GLdouble answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -586,7 +580,6 @@ int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -643,7 +636,6 @@ int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -699,7 +691,6 @@ int __glXDispSwap_GetMaterialfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -754,7 +745,6 @@ int __glXDispSwap_GetMaterialiv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -809,7 +799,6 @@ int __glXDispSwap_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -862,7 +851,6 @@ int __glXDispSwap_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc) int error; GLuint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -915,7 +903,6 @@ int __glXDispSwap_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc) int error; GLushort answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -968,7 +955,6 @@ int __glXDispSwap_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1023,7 +1009,6 @@ int __glXDispSwap_GetTexEnviv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1078,7 +1063,6 @@ int __glXDispSwap_GetTexGendv(__GLXclientState *cl, GLbyte *pc) int error; GLdouble answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1133,7 +1117,6 @@ int __glXDispSwap_GetTexGenfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1188,7 +1171,6 @@ int __glXDispSwap_GetTexGeniv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1243,7 +1225,6 @@ int __glXDispSwap_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1298,7 +1279,6 @@ int __glXDispSwap_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1353,7 +1333,6 @@ int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1410,7 +1389,6 @@ int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1523,7 +1501,6 @@ int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc) int error; GLboolean answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1557,7 +1534,6 @@ int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc) GLsizei n; __GLXcontext *cx; int error; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1585,7 +1561,6 @@ int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc) int error; GLuint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1647,7 +1622,6 @@ int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1702,7 +1676,6 @@ int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1757,7 +1730,6 @@ int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1812,7 +1784,6 @@ int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1867,7 +1838,6 @@ int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1922,7 +1892,6 @@ int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -1977,7 +1946,6 @@ int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc) int error; GLfloat answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -2032,7 +2000,6 @@ int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc) int error; GLint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); @@ -2087,7 +2054,6 @@ int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc) int error; GLboolean answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag); @@ -2121,7 +2087,6 @@ int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc) GLsizei n; __GLXcontext *cx; int error; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag); @@ -2149,7 +2114,6 @@ int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc) int error; GLuint answerBuffer[200]; char *answer; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXVendorPrivateReq *)pc)->contextTag); diff --git a/GL/glx/global.c b/GL/glx/global.c index 73c2e8f3f2..9cd011ec91 100644 --- a/GL/glx/global.c +++ b/GL/glx/global.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* ** 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 3488476c93..6e6f6142bc 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.6 2001/03/25 05:32:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */ /* ** 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 611602f38b..a298b34717 100644 --- a/GL/glx/glxbuf.h +++ b/GL/glx/glxbuf.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glxbuf_h_ #define _glxbuf_h_ diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index df41549915..57c064d19a 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.12 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.13 2004/02/12 02:25:01 torrey Exp $ */ /* ** 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 8c0f1f0915..2c7773b865 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.10 2004/01/28 18:11:50 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.12 2004/03/10 18:08:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -190,7 +190,6 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc) CARD32 buf[__GLX_TOTAL_CONFIG]; unsigned int screen; int i, p; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&req->screen); @@ -405,7 +404,6 @@ void glxSwapQueryExtensionsStringReply(ClientPtr client, xGLXQueryExtensionsStringReply *reply, char *buf) { int length = reply->length; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT(&reply->sequenceNumber); __GLX_SWAP_INT(&reply->length); @@ -432,7 +430,6 @@ void glxSwapQueryServerStringReply(ClientPtr client, void __glXSwapQueryContextInfoEXTReply(ClientPtr client, xGLXQueryContextInfoEXTReply *reply, int *buf) { int length = reply->length; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_SHORT(&reply->sequenceNumber); __GLX_SWAP_INT(&reply->length); diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h index 5eb72177e5..6454b49525 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.4 2002/02/22 21:45:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */ #ifndef _GLX_context_h_ #define _GLX_context_h_ diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h index 972a6045fb..a2c806f446 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.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ diff --git a/GL/glx/glxerror.h b/GL/glx/glxerror.h index 5aad9c3e7d..3c1e93c61b 100644 --- a/GL/glx/glxerror.h +++ b/GL/glx/glxerror.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_error_h_ #define _GLX_error_h_ diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index 796663e9b2..ac08c3df92 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.9 2003/09/28 20:15:43 alanh Exp $ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.10 2004/01/28 22:36:05 alanh Exp $ ** 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 210fbb88c4..fb0d21b857 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.7 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.8 2004/02/09 23:46:31 alanh Exp $ */ #ifndef _glxext_h_ #define _glxext_h_ diff --git a/GL/glx/glxfb.c b/GL/glx/glxfb.c index 789eda52b9..4ce952d519 100644 --- a/GL/glx/glxfb.c +++ b/GL/glx/glxfb.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ /* ** 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 a0011a9ce5..44a72a3e2f 100644 --- a/GL/glx/glxfb.h +++ b/GL/glx/glxfb.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glxfb_h_ #define _glxfb_h_ diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c index b38456f6ff..7ec1134cd0 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.5 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */ /* ** 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 09d8340af5..e1a65a70eb 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.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ #ifndef _glximports_h_ #define _glximports_h_ diff --git a/GL/glx/glxmem.c b/GL/glx/glxmem.c index a389099228..0c3ea25a71 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.6 2001/10/31 22:50:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */ /* ** 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 8890467211..93a2775596 100644 --- a/GL/glx/glxmem.h +++ b/GL/glx/glxmem.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glxmem_h_ #define _glxmem_h_ diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c index cca2105ba1..b21d4ade9a 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.3 2000/09/26 15:57:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */ /* ** 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 2147a6d038..d7a9afab03 100644 --- a/GL/glx/glxpix.h +++ b/GL/glx/glxpix.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glxpix_h_ #define _glxpix_h_ diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index f78b4a2843..1a64b0e192 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.14 2004/02/09 23:46:31 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.15 2004/02/12 02:25:01 torrey Exp $ */ /* ** 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 42dc66e083..99f76dc381 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.4 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.5 2002/02/22 21:45:07 dawes Exp $ */ /* ** 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 be9e40f5a0..9446aefcc6 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.5 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.6 2004/01/28 18:11:50 alanh Exp $ */ #ifndef _GLX_server_h_ #define _GLX_server_h_ diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c index 7aafd00653..ebc9a2bfcc 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.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */ /* ** 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 67bfb06f9d..1f736f0f12 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.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ #ifndef _glxcmds_h_ #define _glxcmds_h_ diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h index 894391003f..322ee18c8a 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.4 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ #ifndef _impsize_h_ #define _impsize_h_ diff --git a/GL/glx/render2.c b/GL/glx/render2.c index d4c523fea0..56453ceff7 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.8 2004/02/03 23:04:08 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.9 2004/02/12 02:25:01 torrey Exp $ */ /* ** 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 7c94b52682..c60da90dcc 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.6 2002/01/14 22:47:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.8 2004/03/10 18:08:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -48,7 +48,6 @@ void __glXDispSwap_Map1f(GLbyte *pc) GLfloat u1, u2, *points; GLenum target; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -80,7 +79,6 @@ void __glXDispSwap_Map2f(GLbyte *pc) GLfloat u1, u2, v1, v2, *points; GLenum target; GLint compsize; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 0); @@ -120,7 +118,6 @@ void __glXDispSwap_Map1d(GLbyte *pc) GLint order, k, compsize; GLenum target; GLdouble u1, u2, *points; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_DOUBLE(pc + 0); @@ -164,7 +161,6 @@ void __glXDispSwap_Map2d(GLbyte *pc) GLdouble u1, u2, v1, v2, *points; GLint uorder, vorder, ustride, vstride, k, compsize; GLenum target; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_DOUBLE(pc + 0); @@ -215,7 +211,6 @@ void __glXDispSwap_CallLists(GLbyte *pc) { GLenum type; GLsizei n; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(pc + 4); diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c index 5ffa47ddb3..ad5625dd6f 100644 --- a/GL/glx/renderpix.c +++ b/GL/glx/renderpix.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** 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 81d4e375f2..3b0e1f6b79 100644 --- a/GL/glx/renderpixswap.c +++ b/GL/glx/renderpixswap.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** 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 aa784b5fc8..e73135db3b 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.6 2003/09/28 20:15:43 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.7 2004/01/28 18:11:53 alanh Exp $ */ /* ** 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 f402bb217d..04ffff6bcd 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.5 2004/01/28 18:11:53 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.6 2004/02/03 23:04:08 alanh Exp $ */ /* ** 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 c757d60bdb..f690ce928b 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.8 2004/02/10 22:54:15 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.10 2004/03/04 19:22:20 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -344,7 +344,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap) if ( atof( string ) > atof( GLServerVersion ) ) { buf = __glXMalloc( __glXStrlen( string ) + __glXStrlen( GLServerVersion ) - + 3 ); + + 4 ); if ( buf == NULL ) { string = GLServerVersion; } diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c index c8c496871c..49fcfe9a58 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.7 2002/01/14 22:47:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.9 2004/03/10 18:08:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -115,7 +115,6 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc) GLint nitems=0, retBytes=0, retval, newModeCheck; GLubyte *retBuffer = NULL; GLenum newMode; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; int error; @@ -271,7 +270,6 @@ int __glXDispSwap_GetClipPlane(__GLXclientState *cl, GLbyte *pc) ClientPtr client = cl->client; int error; GLdouble answer[4]; - __GLX_DECLARE_SWAP_VARIABLES; __GLX_DECLARE_SWAP_ARRAY_VARIABLES; __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag); diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c index 4459d81b1c..85be77d85d 100644 --- a/GL/glx/singlepix.c +++ b/GL/glx/singlepix.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** 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 b4370a2291..2b488312e3 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.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ /* ** 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 448fa1aef4..3f30548718 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.8 2004/02/09 19:51:32 tsi Exp $ */ /* ** 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 15941ec4bc..8293380949 100644 --- a/GL/glx/singlesize.h +++ b/GL/glx/singlesize.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef _singlesize_h_ #define _singlesize_h_ diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h index 6984b45ab6..5a2d10ee92 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.4 2002/01/14 22:47:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.6 2004/03/10 18:08:02 tsi Exp $ */ #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ @@ -146,8 +146,9 @@ extern xGLXSingleReply __glXReply; #define __GLX_DECLARE_SWAP_VARIABLES \ GLbyte sw -#define __GLX_DECLARE_SWAP_ARRAY_VARIABLES \ - GLbyte *swapPC; \ +#define __GLX_DECLARE_SWAP_ARRAY_VARIABLES \ + __GLX_DECLARE_SWAP_VARIABLES; \ + GLbyte *swapPC; \ GLbyte *swapEnd diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c index cb87d552de..3ea767d2bd 100644 --- a/GL/glx/xfont.c +++ b/GL/glx/xfont.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ /* ** 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 c10cf4b64a..c502880558 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.5 2001/03/21 20:49:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */ /* ** 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 08e2a9f6cc..7a467b9b5a 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.3 1999/06/14 07:31:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index 2407059890..170726bff6 100644 --- a/XTrap/xtrapddmi.c +++ b/XTrap/xtrapddmi.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.2 2002/01/23 03:31:39 dawes Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 3322ec8256..d09b2120a2 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */ /***************************************************************************** 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 cab6d5e110..435ca71f68 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991, 1992 by diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index 3c9385794e..db06e1cc2b 100644 --- a/XTrap/xtrapditbl.c +++ b/XTrap/xtrapditbl.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA diff --git a/Xext/EVI.c b/Xext/EVI.c index 820312cca0..09aa03b645 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h index db5655f97d..dfe4423f85 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.5 2003/07/16 01:38:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */ #ifndef EVI_STRUCT_H #define EVI_STRUCT_H diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 1c05b815f8..8718e3630b 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.11 2003/10/28 23:08:43 tsi Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group diff --git a/Xext/appgroup.h b/Xext/appgroup.h index 05c9ef124e..d292cf5095 100644 --- a/Xext/appgroup.h +++ b/Xext/appgroup.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/Xext/appgroup.h,v 1.1 2003/07/16 01:38:28 dawes Exp $ */ void XagClientStateChange( CallbackListPtr* pcbl, diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 893fe9d136..ae73783d99 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.8 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/Xext/cup.c b/Xext/cup.c index d5475d3d88..70c6fa6101 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.11tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/dpms.c b/Xext/dpms.c index e04f3470d7..9d3df8798a 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.12 2004/02/17 15:30:23 eich Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index 36ad391dad..b8260491e0 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.4 2003/07/16 01:38:29 dawes Exp $ */ /* Prototypes for functions that the DDX must provide */ diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c index 24086084ac..bc85c16ca5 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.4 2001/01/17 22:13:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */ typedef int Bool; diff --git a/Xext/fontcache.c b/Xext/fontcache.c index 2b7798f298..7c3f5a800f 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.7 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/Xext/mbuf.c b/Xext/mbuf.c index be08abea77..4308037be3 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index 3e6f9dc204..99400c90a3 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index 6c3e8be6bb..9c531c2924 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index 8fd6c36461..b911d7ff50 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index d9e36d47e7..89a8a2d2e9 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.37tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.38 2003/11/10 18:21:43 tsi Exp $ */ #define NEED_REPLIES #include diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 1222bbaf20..d01b0b8540 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.5 2001/01/03 02:54:17 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index b738271509..e3ea803e68 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.9 2003/07/16 01:38:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */ #include #include "X.h" diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h index 9da5876fd4..d15fc80029 100644 --- a/Xext/panoramiXh.h +++ b/Xext/panoramiXh.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.3 2003/11/17 22:20:26 dawes Exp $ */ /* * Server dispatcher function replacements diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 6c76a309f5..73a441a882 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -26,7 +26,7 @@ Equipment Corporation. /* Massively rewritten by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */ #include #include "X.h" diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index 1d187bc279..27cbcda52f 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.9 2001/08/11 21:00:06 mvojkovi Exp $ */ #ifndef _PANORAMIXSRV_H_ #define _PANORAMIXSRV_H_ diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index 4f23ca383a..15ed9401c4 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$ */ +/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xext/saver.c b/Xext/saver.c index fa75aa5553..1b96932e26 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.7 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.9 2004/03/02 19:43:24 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS @@ -810,7 +810,7 @@ ScreenSaverSetAttributes (ClientPtr client) DepthPtr pDepth; WindowOptPtr ancwopt; unsigned long *pVlist; - unsigned long *values = 0; + unsigned long *values = 0, *save = 0; unsigned long tmask, imask; unsigned long val; Pixmap pixID; @@ -938,6 +938,7 @@ ScreenSaverSetAttributes (ClientPtr client) ret = BadAlloc; goto bail; } + save = values; pAttr->screen = pScreen; pAttr->client = client; pAttr->x = stuff->x; @@ -1166,7 +1167,7 @@ PatchUp: bail: CheckScreenPrivate (pScreen); xfree (pAttr); - xfree (values); + xfree (save); return ret; } diff --git a/Xext/security.c b/Xext/security.c index bf3f981579..f8e96afadb 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.16tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */ #include "dixstruct.h" #include "extnsionst.h" diff --git a/Xext/shape.c b/Xext/shape.c index 433a4e31d0..956a8ebfc3 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/shm.c b/Xext/shm.c index 29eab06f56..b81ff5b222 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 8915224314..afde19cba7 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.6 2003/07/16 01:38:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */ /* dixsleep.c - implement millisecond timeouts for X clients */ diff --git a/Xext/sync.c b/Xext/sync.c index 62636a0c72..25d360bfa8 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.13 2003/09/02 18:19:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 7c9348c0fe..b31057a0d9 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.7 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index dec2c181e7..1da665af03 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.18 2003/11/17 22:20:27 dawes Exp $ */ /* * 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 96e2ca078b..e50fb4068c 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -64,7 +64,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */ #define _XP_PRINT_SERVER_ #include "X.h" diff --git a/Xext/xres.c b/Xext/xres.c index d96b3e150c..28e9266428 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.9 2004/03/04 19:31:37 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES @@ -52,22 +52,23 @@ ProcXResQueryClients (ClientPtr client) /* REQUEST(xXResQueryClientsReq); */ xXResQueryClientsReply rep; int *current_clients; - int i; + int i, num_clients; REQUEST_SIZE_MATCH(xXResQueryClientsReq); current_clients = ALLOCATE_LOCAL((currentMaxClients - 1) * sizeof(int)); - rep.num_clients = 0; + num_clients = 0; for(i = 1; i < currentMaxClients; i++) { if(clients[i]) { - current_clients[rep.num_clients] = i; - rep.num_clients++; + current_clients[num_clients] = i; + num_clients++; } } rep.type = X_Reply; rep.sequenceNumber = client->sequence; + rep.num_clients = num_clients; rep.length = rep.num_clients * sz_xXResClient >> 2; if (client->swapped) { int n; @@ -77,10 +78,10 @@ ProcXResQueryClients (ClientPtr client) } WriteToClient (client, sizeof (xXResQueryClientsReply), (char *) &rep); - if(rep.num_clients) { + if(num_clients) { xXResClient scratch; - for(i = 0; i < rep.num_clients; i++) { + for(i = 0; i < num_clients; i++) { scratch.resource_base = clients[current_clients[i]]->clientAsMask; scratch.resource_mask = RESOURCE_ID_MASK; @@ -112,7 +113,7 @@ ProcXResQueryClientResources (ClientPtr client) { REQUEST(xXResQueryClientResourcesReq); xXResQueryClientResourcesReply rep; - int i, clientID; + int i, clientID, num_types; int *counts; REQUEST_SIZE_MATCH(xXResQueryClientResourcesReq); @@ -132,14 +133,15 @@ ProcXResQueryClientResources (ClientPtr client) FindAllClientResources(clients[clientID], ResFindAllRes, counts); - rep.num_types = 0; + num_types = 0; for(i = 0; i <= lastResourceType; i++) { - if(counts[i]) rep.num_types++; + if(counts[i]) num_types++; } rep.type = X_Reply; rep.sequenceNumber = client->sequence; + rep.num_types = num_types; rep.length = rep.num_types * sz_xXResType >> 2; if (client->swapped) { int n; @@ -149,7 +151,7 @@ ProcXResQueryClientResources (ClientPtr client) } WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep); - if(rep.num_types) { + if(num_types) { xXResType scratch; for(i = 0; i < lastResourceType; i++) { diff --git a/Xext/xtest.c b/Xext/xtest.c index 622a1427f7..89bcae3a43 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.10 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c index 96e680832c..41c78d9c91 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.6 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */ /*************************************************************** * include files diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h index 60663dfb98..6e258080ef 100644 --- a/Xext/xtest1dd.h +++ b/Xext/xtest1dd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.2 2001/08/01 00:44:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.h,v 3.3 2003/11/17 22:20:28 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c index cb22019cb7..539d14e308 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.5 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */ /***************************************************************************** * include files diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index c635657625..40313470cd 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.27 2003/07/16 01:38:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */ /* ** File: diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h index 00af9858b3..342a874e8f 100644 --- a/Xext/xvdisp.h +++ b/Xext/xvdisp.h @@ -1,3 +1,3 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdisp.h,v 1.1 2003/07/16 01:38:31 dawes Exp $ */ extern void XineramifyXv(void); diff --git a/Xext/xvdix.h b/Xext/xvdix.h index d4bff69ad0..8dafa8b26e 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.7 2001/05/07 21:37:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */ #ifndef XVDIX_H #define XVDIX_H diff --git a/Xext/xvmain.c b/Xext/xvmain.c index dfd6d2faa2..2c3f484bdd 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.15tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */ /* ** File: diff --git a/Xext/xvmc.c b/Xext/xvmc.c index c892c9567f..cb6c06301c 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index 6b39d1356c..b589c54875 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */ #ifndef _XVMC_H #define _XVMC_H diff --git a/Xi/allowev.c b/Xi/allowev.c index cca0caaeff..2eb463d41a 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.3 2001/01/17 22:13:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/allowev.h b/Xi/allowev.h index 40c9a30c86..0202b2cf53 100644 --- a/Xi/allowev.h +++ b/Xi/allowev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.1 1996/04/15 11:18:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 91761a39db..f5988d76b8 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.3 2001/01/17 22:13:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h index a7e1c3b241..0d15001a0b 100644 --- a/Xi/chgdctl.h +++ b/Xi/chgdctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.1 1996/04/15 11:18:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c index d00bf5392c..213fc7bf59 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.3 2001/01/17 22:13:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h index cadf27fb4a..4f833617ad 100644 --- a/Xi/chgfctl.h +++ b/Xi/chgfctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.1 1996/04/15 11:18:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index 1aef440450..b0b82ee6d3 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.5 2001/08/23 14:56:19 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.6 2001/12/14 19:58:54 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h index a878f13937..5a2cef2c74 100644 --- a/Xi/chgkbd.h +++ b/Xi/chgkbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.1 1996/04/15 11:18:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index 7d411f1810..2b638252fa 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.2 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h index 1992852631..fd7ed4673c 100644 --- a/Xi/chgkmap.h +++ b/Xi/chgkmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.1 1996/04/15 11:18:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgprop.c b/Xi/chgprop.c index 7d1e141715..96ce0bebe0 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.2 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/chgprop.h b/Xi/chgprop.h index e9cb56a479..9df05b4d09 100644 --- a/Xi/chgprop.h +++ b/Xi/chgprop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.1 1996/04/15 11:18:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/chgptr.c b/Xi/chgptr.c index 0fce984732..c6ece1d65e 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.6 2001/08/23 14:56:19 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.7 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/chgptr.h b/Xi/chgptr.h index adf50b0bde..3168e97105 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/closedev.c b/Xi/closedev.c index 71eb04332b..1f7e7dbd2c 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.3 2001/08/23 14:56:19 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/closedev.h b/Xi/closedev.h index 882d81f145..0295b2c8f6 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/devbell.c b/Xi/devbell.c index 6d3fcce534..98520ec1ce 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.2 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/devbell.h b/Xi/devbell.h index 8ceafa629b..bbf6dea92a 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.1 1996/04/15 11:18:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/exevents.c b/Xi/exevents.c index ec07f443a2..d2b2fb58ca 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.10 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/exglobals.h b/Xi/exglobals.h index 6f397a2d04..f07618b840 100644 --- a/Xi/exglobals.h +++ b/Xi/exglobals.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.2 1996/05/06 05:56:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/extinit.c b/Xi/extinit.c index 60fd885cac..01d51ba645 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.6 2001/12/14 19:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getbmap.c b/Xi/getbmap.c index febfa02936..fb22a14229 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.2 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getbmap.h b/Xi/getbmap.h index f1e300191b..999a7c9f92 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.1 1996/04/15 11:18:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getdctl.c b/Xi/getdctl.c index e7a3a80507..5b24bffbe4 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.3 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getdctl.h b/Xi/getdctl.h index 5092bb4c68..0318b43879 100644 --- a/Xi/getdctl.h +++ b/Xi/getdctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.1 1996/04/15 11:18:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getfctl.c b/Xi/getfctl.c index 94f1bc4a11..59c2c122b2 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.3 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getfctl.h b/Xi/getfctl.h index fe799244af..6ba96b066e 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.1 1996/04/15 11:18:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getfocus.c b/Xi/getfocus.c index e29b54ad6e..2b916da118 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.2 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getfocus.h b/Xi/getfocus.h index 0ae1397145..d3df5ba5f9 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.1 1996/04/15 11:18:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getkmap.c b/Xi/getkmap.c index cd9d00c43d..4a7a7e2965 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.3 2001/01/17 22:13:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getkmap.h b/Xi/getkmap.h index b0dfb9f8e3..ebd02f3ef0 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.1 1996/04/15 11:18:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getmmap.c b/Xi/getmmap.c index 5fe62fcce3..67e36b4427 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.2 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/getmmap.h b/Xi/getmmap.h index deeb28fdd0..ff317e0c4d 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.1 1996/04/15 11:18:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getprop.c b/Xi/getprop.c index 88655322f1..a3f3226ead 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.5 2001/08/23 14:56:19 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getprop.h b/Xi/getprop.h index b75dc515b7..452875bd90 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.1 1996/04/15 11:18:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getselev.c b/Xi/getselev.c index 61ee1091db..75b9137a66 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.5 2001/10/28 03:32:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/Xi/getselev.h b/Xi/getselev.h index 0929de6fd8..5ed759c29e 100644 --- a/Xi/getselev.h +++ b/Xi/getselev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.1 1996/04/15 11:18:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/getvers.c b/Xi/getvers.c index 638548e609..c220b5a814 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.2 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/getvers.h b/Xi/getvers.h index c93359f997..2304c66391 100644 --- a/Xi/getvers.h +++ b/Xi/getvers.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.1 1996/04/15 11:18:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/grabdev.c b/Xi/grabdev.c index 565d4d19da..80f948de5e 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.2 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 8a2e8fb398..1eddd24ac4 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index e4a3dfd305..cbc4fd8bde 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.2 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h index c1a02de589..8782c12ac6 100644 --- a/Xi/grabdevb.h +++ b/Xi/grabdevb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.1 1996/04/15 11:18:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index 6366884ba6..d7481801b9 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.2 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h index cf25e861fa..eb8db95111 100644 --- a/Xi/grabdevk.h +++ b/Xi/grabdevk.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.1 1996/04/15 11:18:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index f22785fd46..1ddcca3ae8 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.6 2001/10/28 03:32:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.7 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h index a4739db387..7d85e566e5 100644 --- a/Xi/gtmotion.h +++ b/Xi/gtmotion.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.1 1996/04/15 11:18:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/listdev.c b/Xi/listdev.c index f95d60d25f..ac4c875a1b 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.3 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.4 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/listdev.h b/Xi/listdev.h index 04518e528e..c9553b6926 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.1 1996/04/15 11:18:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/opendev.c b/Xi/opendev.c index c2a07aaff7..26210fa862 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.2 2001/01/17 22:13:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/opendev.h b/Xi/opendev.h index b5608792df..818e2d877c 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.1 1996/04/15 11:18:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/queryst.c b/Xi/queryst.c index 240c3a610d..598ab85aeb 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.4 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.5 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/queryst.h b/Xi/queryst.h index 051192228f..50d36e95e4 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.1 1996/04/15 11:19:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/selectev.c b/Xi/selectev.c index 11f206cc82..a46a029285 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/selectev.h b/Xi/selectev.h index e2fa176238..2327b94c52 100644 --- a/Xi/selectev.h +++ b/Xi/selectev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.1 1996/04/15 11:19:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/sendexev.c b/Xi/sendexev.c index aa91461760..ae6f8cdc62 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/sendexev.h b/Xi/sendexev.h index 0f935addc2..c2ace5804e 100644 --- a/Xi/sendexev.h +++ b/Xi/sendexev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.1 1996/04/15 11:19:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setbmap.c b/Xi/setbmap.c index cc7c0fbb21..52553948d1 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setbmap.h b/Xi/setbmap.h index 36584767ea..77f097104a 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.1 1996/04/15 11:19:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setdval.c b/Xi/setdval.c index 2704775ae6..fe2e138530 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setdval.h b/Xi/setdval.h index 65ccb45041..e6f08a64c6 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.1 1996/04/15 11:19:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 6e57ad2684..5999345492 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setfocus.h b/Xi/setfocus.h index db2dc1b61a..1da6927b43 100644 --- a/Xi/setfocus.h +++ b/Xi/setfocus.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.1 1996/04/15 11:19:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 7af5e1037c..4c4d19c8b0 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /******************************************************************** * diff --git a/Xi/setmmap.h b/Xi/setmmap.h index fd27104887..30fb57b48e 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.1 1996/04/15 11:19:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/setmode.c b/Xi/setmode.c index 2eff821e79..9c3feb4db6 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/setmode.h b/Xi/setmode.h index e05fb76339..63a1dd35bc 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.1 1996/04/15 11:19:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/stubs.c b/Xi/stubs.c index d1b9f285c4..879d8e9b7b 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.4 2001/12/14 19:58:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.5 2003/11/17 22:20:30 dawes Exp $ */ /* * stubs.c -- stub routines for the X server side of the XINPUT diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c index 7a3c680bcc..a1ab911fe2 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.2 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h index 96d2662e12..9a036901f9 100644 --- a/Xi/ungrdev.h +++ b/Xi/ungrdev.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.1 1996/04/15 11:19:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index a03979dcf7..66ccc72af6 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.3 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h index 2f7899c31c..500b77ebbe 100644 --- a/Xi/ungrdevb.h +++ b/Xi/ungrdevb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.1 1996/04/15 11:19:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index 2bf25248c2..d7632db2a4 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.3 2001/01/17 22:13:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */ /*********************************************************************** * diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h index 275ec446de..c43575ba1b 100644 --- a/Xi/ungrdevk.h +++ b/Xi/ungrdevk.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.1 1996/04/15 11:19:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/Xprint/AttrValid.c b/Xprint/AttrValid.c index a3046c159c..83d6b9674f 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.4 2001/01/17 22:36:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */ #include diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h index 8e431c285e..87ab48b691 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.6 2001/10/31 22:50:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */ #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h index d6364af26f..3830c20d2d 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.3 1999/12/16 02:26:24 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ /* * The XpDiListEntry struct is the type of each element of the array diff --git a/Xprint/Init.c b/Xprint/Init.c index 0deafda7c7..c936f4542b 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -50,7 +50,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.14tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */ #include #include diff --git a/Xprint/Oid.c b/Xprint/Oid.c index 311d177d0e..4c23a6e097 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */ #include "attributes.h" diff --git a/Xprint/Oid.h b/Xprint/Oid.h index e2a97869f6..c5574b06ee 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.3 1999/12/16 02:26:24 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ #ifndef _Xp_Oid_h #define _Xp_Oid_h diff --git a/Xprint/OidStrs.h b/Xprint/OidStrs.h index 6489ae533f..3aab300dc1 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.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ static int XpOidStringMapCount = 127; diff --git a/Xprint/Util.c b/Xprint/Util.c index 1f4a14666a..9e0bdf925a 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.12 2001/08/01 00:44:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.13 2001/10/31 22:50:28 tsi Exp $ */ /* To get the tempnam() prototype in */ #if defined(linux) && defined(__STRICT_ANSI__) diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c index 983e5c1c4f..327cb468ca 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$ */ +/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/Xprint/attributes.c b/Xprint/attributes.c index 7cb95b3054..e1fce8cb33 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -44,7 +44,7 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */ #include #include diff --git a/Xprint/attributes.h b/Xprint/attributes.h index b43d76af50..d9d551f32e 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.5 2001/08/01 00:44:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _Xp_attributes_h #define _Xp_attributes_h 1 diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 4c0f20b0bb..3d29fd1b14 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.13 2001/06/11 16:59:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.15 2003/06/23 17:35:44 eich Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index b24f5c6c05..7bb08b4127 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.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h index f11cc7a6c0..2af1b2c414 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.12 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */ #ifndef _PCL_H_ #define _PCL_H_ diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c index af32eb6199..ca13b3a846 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.4 1999/12/13 02:12:53 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */ #include #include diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c index 00e6aff047..971506da67 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.8 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c index d5d2e022bc..c279c8024e 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.9tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c index e7288c9eca..7e463d4987 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.3 1999/12/16 02:26:27 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ #include diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c index d5eff48c7b..f2141f9ff4 100644 --- a/Xprint/pcl/PclFonts.c +++ b/Xprint/pcl/PclFonts.c @@ -13,7 +13,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */ /* (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 67331a454e..e1fe772bdf 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.9 2001/01/19 18:34:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.10 2001/10/28 03:32:54 tsi Exp $ */ #include "gcstruct.h" diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index 460c11eb66..5ee49631e0 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.11 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.12 2002/10/16 21:13:32 dawes Exp $ */ #include #include diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c index aa72e8ff05..3c10f97ca8 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.6 1999/12/13 02:12:55 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ #include "Pcl.h" #include "gcstruct.h" diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c index 63caa0fe59..5b0939df2b 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c index 372a54e9f2..238a159ab6 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */ #include diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c index 178289bc19..ba91fc9ece 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.3 1999/12/16 02:26:27 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ #include "Pcl.h" #include "cfb.h" diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c index ddfd9ef8aa..a5de773999 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.6 1999/12/13 02:12:56 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ #include "Pcl.h" diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c index 70c788eac1..aa2164c92f 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */ #include #include diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c index 121ed00773..3c7cf05af3 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.8 2003/12/22 17:48:05 tsi Exp $ */ #include diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c index 92261c9770..98c17dcf98 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.5 1999/12/13 02:12:57 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */ #include "Pcl.h" diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c index 9ef4c505fb..48b4684271 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ #ifdef DO_TWO_BYTE_PCL #include "iconv.h" diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c index 42a6f62341..27d8ea97d7 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ #include diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h index 1a68faf1ec..1386b0ab4d 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.5 2001/07/25 15:05:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ #ifndef _PCLMAP_H_ #define _PCLMAP_H_ diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index d33f301fab..7b0aaeb391 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.13 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */ #ifndef _PS_H_ #define _PS_H_ diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c index 4a7865af6e..a6a3754877 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.4 2001/01/17 22:36:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.5 2001/12/19 21:28:44 dawes Exp $ */ #include "Ps.h" #include "AttrValid.h" diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c index f276c180fc..13c4e19788 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.4 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.5 2001/12/14 19:59:15 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c index 6417410ee9..92082226f0 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.2 2001/10/28 03:32:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.3 2001/12/14 19:59:15 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c index 1f87f7e762..9792dae4df 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.6 2001/12/19 21:55:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c index ea441cff58..1c2877231d 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.7 2003/10/29 22:11:55 tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c index a7a63343d6..193fc05182 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.13tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */ #include #include diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c index dd01fcb658..ff4c6da805 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.5 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c index 3085888c74..75f692d565 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.5 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ #include "Xos.h" /* for SIGCLD on pre-POSIX systems */ #include diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c index 303b0d5ec4..09a89fa2d1 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.5 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ #include diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c index a020aba22a..2e821aa1c7 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.4 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.5 2001/12/14 19:59:16 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c index d334c77781..0cd826f433 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.6 2001/01/17 22:36:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.7 2001/12/14 19:59:17 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c index 5e549836f3..8a06205e5c 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.10 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */ #include #include diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c index a7370866ea..32ca58d205 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.8 2001/10/28 03:32:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.9 2001/12/14 19:59:17 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c index ae44b3f1c4..b04d910d5f 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.12tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ #include "Ps.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c index 987d434ff3..e39b602cb3 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.12tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ #include #include diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c index 6b4c71a2bc..f1507d8491 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.11 2001/12/19 21:55:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.12 2001/12/21 21:02:06 dawes Exp $ */ /* * For XFree86 3.3.3: diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h index 37b089ece0..2fe83ffc7d 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.4 2001/12/14 19:59:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.5 2001/12/21 21:02:06 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index c8dfad1e3f..d306dea21d 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.11tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index 750dc07224..0533cd5b20 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.3 2001/10/31 22:50:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ /******************************************************************* ** diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 4527ba8dbc..7cce3f22ab 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.3 2001/10/31 22:50:29 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ #include #include "X.h" diff --git a/afb/afb.h b/afb/afb.h index 708fe7643e..1f64017823 100644 --- a/afb/afb.h +++ b/afb/afb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.10 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.11 2003/11/17 22:20:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index b07216899b..7f04a7de02 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.6 2003/11/10 18:21:44 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbblt.c b/afb/afbblt.c index 13a56e521d..c0b48130e6 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.0 1996/08/18 01:45:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.1 2001/10/28 03:32:57 tsi Exp $ */ /* * afb copy area */ diff --git a/afb/afbbres.c b/afb/afbbres.c index 732ea65faf..227f3bc1f6 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.0 1996/08/18 01:45:25 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 581ecb84fd..57309175e5 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.0 1996/08/18 01:45:26 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbbstore.c b/afb/afbbstore.c index c3e844d57c..725f93d48a 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.0 1996/08/18 01:45:28 dawes Exp $ */ /* $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 0acf35b2aa..07eb3b816a 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.2 2001/10/28 03:32:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.3 2003/07/16 01:38:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbcmap.c b/afb/afbcmap.c index cfa41aab3c..e565589723 100644 --- a/afb/afbcmap.c +++ b/afb/afbcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.0 1996/08/18 01:45:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.1 1998/11/22 10:36:58 dawes Exp $ */ /* $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 e13c7948aa..1db48b07c7 100644 --- a/afb/afbfillarc.c +++ b/afb/afbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.1 1998/03/20 21:04:54 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c index b5e6802d2a..25ab5e56e8 100644 --- a/afb/afbfillrct.c +++ b/afb/afbfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c index 647641d7de..69985aebcc 100644 --- a/afb/afbfillsp.c +++ b/afb/afbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.3 2000/11/22 00:58:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.4 2001/10/28 03:32:58 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbfont.c b/afb/afbfont.c index 5df6691c57..0ad8d9de38 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.0 1996/08/18 01:45:35 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/afb/afbgc.c b/afb/afbgc.c index 4ce8939026..fe88475a3a 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.2 1999/06/20 15:02:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 26ed5ba60c..0fa825d210 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.0 1996/08/18 01:45:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c index 7165afd519..b50c357b44 100644 --- a/afb/afbhrzvert.c +++ b/afb/afbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.0 1996/08/18 01:45:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.1 2001/08/01 00:44:47 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbimage.c b/afb/afbimage.c index 52553f55a3..cfb230e368 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c index 8f7509df5a..60d212ca08 100644 --- a/afb/afbimggblt.c +++ b/afb/afbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.2 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbline.c b/afb/afbline.c index 221e2ddd7d..796ddffeb5 100644 --- a/afb/afbline.c +++ b/afb/afbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.1 1998/03/20 21:04:55 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbmisc.c b/afb/afbmisc.c index 4928a84d38..c0ae1c545a 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.0 1996/08/18 01:45:44 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index 951ec99467..fe0d8bc79c 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.0 1996/08/18 01:45:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1 1997/06/03 14:11:07 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index 3156b0617c..c0c2065f1f 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ /* * $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 26d87868a4..3938433c38 100644 --- a/afb/afbplygblt.c +++ b/afb/afbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c index c552b388aa..239346ceb6 100644 --- a/afb/afbpntarea.c +++ b/afb/afbpntarea.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.0 1996/08/18 01:45:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index bb84e676a0..17d9240598 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.0 1996/08/18 01:45:50 dawes Exp $ */ /* $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 23dca74161..b09f3b0370 100644 --- a/afb/afbpolypnt.c +++ b/afb/afbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index 311becb8ab..d556acd8c1 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index d947825e20..d2b3fd02b8 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.4 1998/07/25 08:50:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.5 1998/11/22 10:36:59 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index a4ea4d3ac5..93331b8577 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.2 2001/08/01 00:44:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c index a4acf326f0..b12eeb2526 100644 --- a/afb/afbtegblt.c +++ b/afb/afbtegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.1 1998/03/20 21:04:57 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ /* $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 b4376d18c5..3b861b822a 100644 --- a/afb/afbtile.c +++ b/afb/afbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.4 2003/10/29 22:15:19 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbwindow.c b/afb/afbwindow.c index b6037d8cb4..024fc04b66 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.0 1996/08/18 01:45:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.1 2003/09/13 21:33:04 dawes Exp $ */ /* $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 ae9136f706..db1bd2bfd1 100644 --- a/afb/afbzerarc.c +++ b/afb/afbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.2 2001/10/28 03:32:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.3 2003/07/16 01:38:36 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/cfb/cfb.h b/cfb/cfb.h index e5900dc151..b7d0279056 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.29tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.30 2003/07/19 13:22:27 tsi Exp $ */ #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 3309fb764d..1dd742c603 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.4 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */ /* * cfb8bit.c diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h index 2bfdace35a..0c6b519254 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.7 2001/12/14 19:59:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.8 2003/11/17 22:20:32 dawes Exp $ */ /* diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 6f8f896b80..01c412b97e 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.18tsi Exp $ + * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.19 2003/10/29 22:44:52 tsi Exp $ * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 8b2468992a..6c2fa30f32 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.11 2001/01/30 22:06:15 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.12 2001/12/14 19:59:21 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index b8ef233012..18f90f1fd2 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.19tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.20 2003/11/10 18:21:44 tsi Exp $ */ /* diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 7f4e3e10f4..5d2e084fd7 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.13tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ /* diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index b306ee80b0..4522595818 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.4 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index 4f6630ab38..7fe71fa2fa 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.5 2001/01/17 22:36:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 19de06ad96..5e7b914713 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.4 1999/01/31 12:21:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */ /*- * cfbbstore.c -- * Functions required by the backing-store implementation in MI. diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 1806916ff8..1830ffa5ed 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.12 2000/02/12 03:39:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */ #include "X.h" diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index a2a51a4521..ee4c18fdc6 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.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.7 2003/07/16 01:38:37 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 01e4557d46..64ec508c86 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index 86258ed4fa..c6a7270c2d 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -1,7 +1,7 @@ /* * Fill rectangles. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.7 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */ /* diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index 6234694d6e..14a6a9d52e 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index b4a9cc4841..c2e7a59659 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.5 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index 003be6dccc..737f302375 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.9tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index c0fb01c0e5..60a012c285 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.7 2003/07/16 01:38:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */ /* * Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 88b1e740f4..6f4f7abe67 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.6 2001/10/28 03:33:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */ /*********************************************************** Copyright 1987,1998 The Open Group diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index a40e995be0..aa10602400 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.5 2001/10/28 03:33:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.6 2001/12/14 19:59:23 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index 68b5cc68d6..1983ae48a0 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.12 2001/10/28 03:33:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 28b0cb8c51..432cb62d98 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 60fa94df20..42056345a2 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.11tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.12 2003/07/19 13:22:27 tsi Exp $ */ /* * Map names around so that multiple depths can be supported simultaneously diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index 5bc759d01d..cbf3647702 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.1 1998/10/04 09:37:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index 5d5764c092..b7f9969dd9 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.13tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 3502e879c1..bd2e1b6f17 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.4 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */ /* pixmap management written by drewry, september 1986 diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index fa38f0cf42..0b14bc614d 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.10 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.11 2003/10/30 14:53:39 tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index ec0bb79107..c77d01961c 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index a5886b6ecf..d8b781397f 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.5 2001/10/28 03:33:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 3f313b0e39..0de172f03a 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.5 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ /* diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index ba8dd89f22..7f6e93919b 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.5 2001/10/28 03:33:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 3014b3a5a2..1ee6771e06 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.5 2001/10/28 03:33:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ /* cfb reduced rasterop computations */ diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index a43bf19784..d8dce082c2 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.11 2003/10/29 22:44:53 tsi Exp $ */ #ifndef GXcopy #include "X.h" diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index ffdf55b814..7e0d15dd4f 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.19 2001/01/17 22:36:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.20 2003/07/16 01:38:37 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 8385fe35ad..4f7dfaee1f 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.6 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index f4e7f33855..f0a3e361ea 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.8tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.9 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h index c27f693129..5c4f1c445f 100644 --- a/cfb/cfbtab.h +++ b/cfb/cfbtab.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtab.h,v 1.1 2003/07/16 01:38:37 dawes Exp $ */ #ifndef _CFBTAB_H_ #define _CFBTAB_H_ diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index 9048ec3750..0cdbddc7a4 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.5 2001/10/28 03:33:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.6 2001/12/14 19:59:25 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index ff7f3be57f..7450c7829f 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index 1ba4bb16d3..b202943e83 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ /* diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index bd6a0b82c9..e372fe87df 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ /* diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index 13148728c0..cae13cf3c7 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.6 2003/11/10 18:21:45 tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index baa89f3189..3703a5105e 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.5 2003/10/29 22:44:53 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h index 01bb939e88..9a2bac720a 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.3 2001/01/17 22:36:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.4 2001/12/14 19:59:25 dawes Exp $ */ /* * Stipple stack macro for 68k GCC diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s index a6a40491f7..1857956051 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.4 2001/01/17 22:36:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s index 5703c0f1b0..f878fbf809 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.4 2001/01/17 22:36:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */ /* * SPARC assembly code for optimized text rendering. diff --git a/cfb24/cfbrrop24.h b/cfb24/cfbrrop24.h index 9f15d1a826..0bb97ce5ba 100644 --- a/cfb24/cfbrrop24.h +++ b/cfb24/cfbrrop24.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb24/cfbrrop24.h,v 3.2 2003/10/29 22:46:27 tsi Exp $ */ #define RROP_DECLARE \ unsigned long piQxelAnd[3], piQxelXor[3], spiQxelXor[8]; diff --git a/dbe/dbe.c b/dbe/dbe.c index fbebdf3631..6b92baac70 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.10 2001/08/23 14:19:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbe.c,v 3.11 2001/10/28 03:33:04 tsi Exp $ */ /* INCLUDES */ diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index f176c6fd17..3634fe7d7b 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -30,7 +30,7 @@ * Header file for DIX-related DBE * *****************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/dbe/dbestruct.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ #ifndef DBE_STRUCT_H diff --git a/dbe/midbe.c b/dbe/midbe.c index bdf46b8ae2..e7617e7280 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.4 2001/03/06 17:31:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/midbe.c,v 3.5 2001/08/23 14:19:24 alanh Exp $ */ /* INCLUDES */ diff --git a/dbe/midbe.h b/dbe/midbe.h index 3f9bb0090e..7b12376337 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -30,7 +30,7 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/dbe/midbe.h,v 3.2 2003/11/17 22:20:32 dawes Exp $ */ #ifndef MIDBE_H diff --git a/dix/atom.c b/dix/atom.c index 7509f0a247..66c045583c 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.3 2001/12/14 19:59:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.4 2002/02/19 11:09:21 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/colormap.c b/dix/colormap.c index 168613fe9a..af959ed86d 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.12 2003/11/17 22:20:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/cursor.c b/dix/cursor.c index fc81a51970..2ef9e5e246 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.8 2003/01/12 02:44:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.9 2003/11/17 22:20:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/devices.c b/dix/devices.c index d4e4be8239..46af5eabcd 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.20 2001/12/14 19:59:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.21 2003/11/17 22:20:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/dispatch.c b/dix/dispatch.c index 24191fe17f..cd1ce6790d 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -68,7 +68,7 @@ SOFTWARE. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.33 2003/11/17 22:20:33 dawes Exp $ */ #ifdef PANORAMIX_DEBUG #include diff --git a/dix/dispatch.h b/dix/dispatch.h index ba43bdca29..d144c6c70f 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.2 2001/08/01 00:44:48 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.3 2002/02/19 11:09:21 alanh Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 537c83119f..d971260c73 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.29 2003/11/17 22:20:34 dawes Exp $ */ /************************************************************************ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/dix/dixutils.c b/dix/dixutils.c index 40f80d3487..38cfd4e0db 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.13 2003/01/12 02:44:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/events.c b/dix/events.c index b7cdbdc571..2853e1013d 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.52 2004/01/23 07:23:34 herrb Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/extension.c b/dix/extension.c index 3fcf31b8e6..36f053f028 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/gc.c b/dix/gc.c index ee787bca30..11f215c8d9 100644 --- a/dix/gc.c +++ b/dix/gc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.9 2001/12/14 19:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.10 2003/11/17 22:20:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/globals.c b/dix/globals.c index 3963ae50be..29926308ac 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/grabs.c b/dix/grabs.c index 6eba43d1ff..7a9fbcdb55 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.4 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.5 2003/11/17 22:20:34 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/dix/main.c b/dix/main.c index 802fb59c88..37add2a623 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/pixmap.c b/dix/pixmap.c index 2df5d73748..fda07801c3 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.4 2001/01/17 22:36:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.5 2001/12/14 19:59:32 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/dix/privates.c b/dix/privates.c index 64d705e248..2d08858468 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.7 2001/01/17 22:36:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.8 2001/12/14 19:59:32 dawes Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/dix/property.c b/dix/property.c index f3d0edc9ec..1af6156b50 100644 --- a/dix/property.c +++ b/dix/property.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.12 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.13 2003/07/16 01:38:37 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/resource.c b/dix/resource.c index c3ec1b6286..d885c03ef3 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.13 2003/09/24 02:43:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.14 2003/11/17 22:20:34 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/dix/swaprep.c b/dix/swaprep.c index 6bde83b967..4944717302 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.7 2001/12/14 19:59:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.8 2003/11/17 22:20:35 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/swapreq.c b/dix/swapreq.c index d795a3deaf..358ec81398 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.4 2001/12/14 19:59:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/dix/tables.c b/dix/tables.c index 6037b12202..a76bc7535f 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.5 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.6 2003/11/17 22:20:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/dix/window.c b/dix/window.c index c1c886e3e4..0ed9cb0835 100644 --- a/dix/window.c +++ b/dix/window.c @@ -70,7 +70,7 @@ SOFTWARE. * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.37 2003/11/17 22:20:35 dawes Exp $ */ #include "misc.h" #include "scrnintstr.h" diff --git a/dix/xpstubs.c b/dix/xpstubs.c index ab30dad9f2..a48a814023 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/dix/xpstubs.c,v 1.4 2001/12/20 19:41:00 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre index a50cb4cd9f..4a24ac9a2e 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.31 2004/01/10 22:27:46 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.32 2004/01/12 21:43:19 herrb Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH XSERVER 1 __xorgversion__ diff --git a/doc/smartsched b/doc/smartsched index 057a759fd2..3d5a84b9b6 100644 --- a/doc/smartsched +++ b/doc/smartsched @@ -201,4 +201,4 @@ response and benchmark numbers at the same time. -$XFree86: $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/smartsched,v 1.2 1999/11/19 14:59:16 hohndel Exp $ diff --git a/fb/fb.h b/fb/fb.h index fc8dc02292..c9633d248f 100644 --- a/fb/fb.h +++ b/fb/fb.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.36tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fb.h,v 1.37 2003/11/03 05:11:00 tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 08d6817981..1f9e843cf5 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.4 2000/08/09 17:50:51 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fb24_32.c,v 1.5 2001/05/29 04:54:08 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fb24_32.h b/fb/fb24_32.h index 80034aa255..d0a0acb97d 100644 --- a/fb/fb24_32.h +++ b/fb/fb24_32.h @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/fb/fb24_32.h,v 1.1 2000/04/04 19:24:49 dawes Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fballpriv.c b/fb/fballpriv.c index e7fcfd45b2..687de493ac 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.3 2000/02/23 20:29:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.4 2000/05/06 21:09:31 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbarc.c b/fb/fbarc.c index bba95a84eb..9713ffb093 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.8 2002/11/09 04:59:29 tsi Exp $ */ #include "fb.h" #include "mizerarc.h" diff --git a/fb/fbbits.c b/fb/fbbits.c index 3cca2bbb26..b1c123d21b 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.5 2000/02/17 14:16:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.6 2000/02/23 20:29:41 dawes Exp $ */ #include "fb.h" #include "miline.h" diff --git a/fb/fbbits.h b/fb/fbbits.h index 4f9d04e628..80fbc40105 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/fb/fbbits.h,v 1.14 2003/11/03 05:11:00 tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbblt.c b/fb/fbblt.c index c6e29f387b..b1fd5f5b01 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.7 2000/09/22 05:58:01 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbbltone.c b/fb/fbbltone.c index 7620225513..e758794b88 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.11 2001/09/07 15:15:31 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.13 2002/02/23 00:42:07 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbbstore.c b/fb/fbbstore.c index 7b08638566..07a6400a8c 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.1 1999/11/19 13:53:42 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.2 2000/02/23 20:29:42 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbcmap.c b/fb/fbcmap.c index 001277a1d7..aeb53b1fba 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.5 2000/09/20 00:09:13 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcmap.c,v 1.6 2001/10/28 03:33:08 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 150d619499..4938f89d09 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 2f2d2f12b2..6dd48a786b 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.13 2003/11/10 18:21:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.14 2003/12/28 17:22:25 alanh Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbfill.c b/fb/fbfill.c index d03bc64618..8ecb3cde68 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.5 2003/01/29 00:43:33 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ #include "fb.h" diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index c39b500fd0..d0468e0419 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.1 1999/11/19 13:53:43 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index dae05b0edd..29c3a36b02 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.1 1999/11/19 13:53:43 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbgc.c b/fb/fbgc.c index 9447f30876..1e9eb5aa37 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.14 2003/12/18 15:22:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index 3140377e5f..db35f6d5c0 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.5 2000/05/06 21:09:33 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.6 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbglyph.c b/fb/fbglyph.c index c261d7add7..3ad8d25072 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbimage.c b/fb/fbimage.c index 49356f6272..7d0284c384 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.7 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.8 2001/09/07 15:15:31 keithp Exp $ */ #include "fb.h" #ifdef XFree86LOADER diff --git a/fb/fbline.c b/fb/fbline.c index d487801004..957222492f 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/fb/fbline.c,v 1.8 2003/11/03 05:11:00 tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 28068db836..00521eef2b 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.6tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fboverlay.h b/fb/fboverlay.h index 72891ece33..3dca8a3a4f 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.4tsi Exp $ + * $XFree86: xc/programs/Xserver/fb/fboverlay.h,v 1.5 2002/09/19 13:22:00 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.c b/fb/fbpict.c index 533f08d01a..894d5cd62a 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.15 2002/09/26 02:56:48 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbpict.c,v 1.16 2002/12/14 01:46:02 dawes Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/fb/fbpict.h b/fb/fbpict.h index 9ecc7a9094..fd911b0784 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.7 2001/07/18 10:15:02 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbpict.h,v 1.11 2002/09/26 02:56:48 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index e47999dbbc..757406c211 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.9 2001/05/29 04:54:09 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.11 2002/09/16 18:05:34 eich Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 255cfa05cf..20426a9f1d 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.7 2000/09/22 05:58:01 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbpush.c b/fb/fbpush.c index ffb357ca3e..4ae60764c6 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.3 2000/02/14 19:20:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbrop.h b/fb/fbrop.h index 0b97be66ff..9481be6800 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.3 2000/02/14 19:20:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.4 2000/02/23 20:29:46 dawes Exp $ */ #ifndef _FBROP_H_ #define _FBROP_H_ diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 2a46b00bea..bdcc9d1397 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.11 2000/09/03 05:09:47 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbseg.c b/fb/fbseg.c index 993672b2c8..284f11fa99 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.7 2001/01/17 07:40:02 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.8 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" #include "miline.h" diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index ea9f3b581c..e207760c6e 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.4 2000/05/06 21:09:34 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.5 2001/05/29 04:54:09 keithp Exp $ */ #include "fb.h" diff --git a/fb/fbsolid.c b/fb/fbsolid.c index a325da0c2b..17b5bffe0c 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ * * Copyright © 1998 Keith Packard * diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 46278c1acf..88f694bb84 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.6 2000/02/23 20:29:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.7 2001/10/28 03:33:08 tsi Exp $ */ #include "fb.h" diff --git a/fb/fbtile.c b/fb/fbtile.c index 27cd423724..ed447f8d3e 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.3 2000/02/12 03:39:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ #include "fb.h" diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 8fcd2b5cc4..3a44d53efa 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.9 2002/09/26 02:56:48 keithp Exp $ + * $XFree86: xc/programs/Xserver/fb/fbtrap.c,v 1.10 2002/09/27 00:31:24 keithp Exp $ * * Copyright © 2000 University of Southern California * diff --git a/fb/fbutil.c b/fb/fbutil.c index 436bff72ce..54b88ad7ea 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.4 2000/02/23 20:29:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.5 2001/03/28 14:37:03 alanh Exp $ */ #include "fb.h" diff --git a/fb/fbwindow.c b/fb/fbwindow.c index d0407f3c21..2627165435 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.11 2003/11/10 18:21:47 tsi Exp $ */ #include "fb.h" #ifdef IN_MODULE diff --git a/hw/darwin/XDarwin.man b/hw/darwin/XDarwin.man index 265dbeb632..a718e41cee 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.3 2001/09/23 23:02:37 torrey Exp $ +.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $ .\" .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 979f0bb067..e7ca52c2c0 100644 --- a/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp @@ -1 +1 @@ - #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif XFree86 voor Mac OS X

XFree86 voor Darwin en Mac OS X

XFree86 XF86_VERSION
Release Date: XF86_REL_DATE

Inhoud

  1. Belangrijke Informatie
  2. Gebruik
  3. Instellen van het Path
  4. Voorkeursinstellingen
  5. Licentie

Belangrijke Informatie

#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 XonX project pagina bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij XonX of in de XFree86 CVS repository. #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 XonX project pagina bij SourceForge. #endif
Deze software is beschikbaar gesteld onder de voorwaarden van de MIT X11 / X Consortium Licentie en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de Licentie voor gebruik.

Gebruik

XFree86 is een open-source uitvoering van het X Window Systeem, verzorgd door XFree86 Project, Inc., 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.

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.)

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.

Meerknopsmuis emulatie

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.

Instellen van het Path

Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory /usr/X11R6/bin, 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ïnstalleerd.

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.

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 /usr/X11R6/man en de MANPATH environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.

Voorkeursinstellingen

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:

Algemeen

  • Gebruik systeempiep voor X11: Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).
  • Wijzigen muis-versnelling door X11 mogelijk: 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.
  • Meerknopsmuis emulatie: Dit is hierboven beschreven bij Gebruik. 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.

Start

  • Standaard modus: Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij Gebruik). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.
  • Kies scherm-modus tijdens start: 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.
  • X11 scherm nummer: 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.
  • Xinerama multi-monitor ondersteuning mogelijk: XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van éé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.
  • Toetsenbordindeling-bestand: Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory /System/Library/Keyboards.
  • Bij starten eerste X11 clients: Als XDarwin start, wordt xinit uitgevoerd om de X window manager en andere X clients te starten (zie "man xinit"). Voordat XDarwin xinit uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen /usr/X11R6/bin 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.

Schermvullend

  • Toetscombinatie knop: 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 één normale toets.
  • Klikken op icoon in Dock schakelt naar X11: 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.
  • Toon help bij schermvullend starten: Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.
  • Kleurdiepte: 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.

Licentie

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 XFree86 License page.

X Consortium License

Copyright (C) 1996 X Consortium

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:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

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.

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.

X Window System is a trademark of X Consortium, Inc.

\ No newline at end of file + #include "xf86Version.h" #ifndef PRE_RELEASE #define PRE_RELEASE XF86_VERSION_SNAP #endif XFree86 voor Mac OS X

XFree86 voor Darwin en Mac OS X

XFree86 XF86_VERSION
Release Date: XF86_REL_DATE

Inhoud

  1. Belangrijke Informatie
  2. Gebruik
  3. Instellen van het Path
  4. Voorkeursinstellingen
  5. Licentie

Belangrijke Informatie

#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 XonX project pagina bij SourceForge. Kijk alvorens een bug te rapporteren in een pre-release eerst of een nieuwe versie beschikbaar is bij XonX of in de XFree86 CVS repository. #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 XonX project pagina bij SourceForge. #endif
Deze software is beschikbaar gesteld onder de voorwaarden van de MIT X11 / X Consortium Licentie en is beschikbaar 'AS IS',zonder enige garantie. Lees s.v.p. de Licentie voor gebruik.

Gebruik

XFree86 is een open-source uitvoering van het X Window Systeem, verzorgd door XFree86 Project, Inc., 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.

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.)

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.

Meerknopsmuis emulatie

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.

Instellen van het Path

Het path is de lijst van directories waarin gezocht wordt naar commando's. De X11 commando's staan in de directory /usr/X11R6/bin, 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ïnstalleerd.

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.

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 /usr/X11R6/man en de MANPATH environment variable bevat de lijst van directories waarin naar documentatie wordt gezocht.

Voorkeursinstellingen

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:

Algemeen

  • Gebruik systeempiep voor X11: Als u dit inschakelt wordt het Mac OS X waarschuwingssignaal ook gebruikt door X11, anders gebruikt X11 een simpele pieptoon (dit is de standaardinstelling).
  • Wijzigen muis-versnelling door X11 mogelijk: 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.
  • Meerknopsmuis emulatie: Dit is hierboven beschreven bij Gebruik. 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.

Start

  • Standaard modus: Hier kiest u de standaard scherm-modus: schermvullend of rootless (hierboven beschreven bij Gebruik). U kunt ook kiezen tijdens het starten van XDarwin, zie de optie hieronder.
  • Kies scherm-modus tijdens start: 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.
  • X11 scherm nummer: 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.
  • Xinerama multi-monitor ondersteuning mogelijk: XDarwin ondersteunt het gebruik van meerdere monitoren met Xinerama, waarbij elke monitor wordt gezien als deel van éé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.
  • Toetsenbordindeling-bestand: Een toetsenbordindeling-bestand wordt bij het starten geladen en omgezet naar een X11 toetsenbordindeling. Voor verschillende talen vindt u toetsenbordindelingen in de directory /System/Library/Keyboards.
  • Bij starten eerste X11 clients: Als XDarwin start, wordt xinit uitgevoerd om de X window manager en andere X clients te starten (zie "man xinit"). Voordat XDarwin xinit uitvoert voegt het de opgegeven directories toe aan het path. Standaard wordt alleen /usr/X11R6/bin 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.

Schermvullend

  • Toetscombinatie knop: 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 één normale toets.
  • Klikken op icoon in Dock schakelt naar X11: 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.
  • Toon help bij schermvullend starten: Hiermee wordt een inleidend scherm getoond als XDarwin schermvullend start.
  • Kleurdiepte: 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.

Licentie

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 XFree86 License page.

X Consortium License

Copyright (C) 1996 X Consortium

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:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

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.

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.

X Window System is a trademark of X Consortium, Inc.

\ 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 4a8467ce19..99211244e1 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.3 2002/07/17 01:24:55 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.4 2003/01/15 02:34:04 torrey Exp $ */ 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 2c25c1dc31..241d1585b4 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.3 2002/01/30 06:50:46 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/Localizable.strings,v 1.4 2003/11/04 22:48:14 torrey Exp $ */ /* 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 5f18216aa8..fc11e26d38 100644 --- a/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 4b23c46cd8..0fdfb01fb9 100644 --- a/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 f7b6e96aec..6b1b91f5c1 100644 --- a/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 3e06770567..2065d43d4b 100644 --- a/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 573f84c503..37502eac6e 100644 --- a/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 315f647c98..3e0710a2c2 100644 --- a/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 c0cdf9f753..ee099d1a08 100644 --- a/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #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 fc11e26d38..4c83fe2782 100644 --- a/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp +++ b/hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp @@ -1,4 +1,4 @@ - + #include "xf86Version.h" #ifndef PRE_RELEASE diff --git a/hw/darwin/bundle/startXClients.cpp b/hw/darwin/bundle/startXClients.cpp index 51cdb5c9e5..b27ad46fed 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: $ +XCOMM $XFree86: xc/programs/Xserver/hw/darwin/bundle/startXClients.cpp,v 1.1 2001/10/18 05:03:42 torrey Exp $ userclientrc=$HOME/.xinitrc sysclientrc=XINITDIR/xinitrc diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index 271c72cecf..bf09757699 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.55 2003/11/15 00:07:09 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index e49c450efa..79fa00ffc8 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.19 2003/10/16 23:50:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */ #ifndef _DARWIN_H #define _DARWIN_H diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h index 06e7b71c51..68a7ad16f7 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.1.8.1 2003/03/04 01:31:43 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.2 2003/03/04 01:37:59 torrey Exp $ */ #ifndef _DARWIN_CLUT8_ #define _DARWIN_CLUT8_ diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c index d376624b92..ba1ec8fc2c 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$ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.5 2003/11/03 05:36:30 tsi Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c index 39c5ba58f8..57bf5fa3dd 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.18 2003/05/14 05:27:55 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.19 2003/11/01 08:13:08 torrey Exp $ */ /* =========================================================================== diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h index 405dcf9d17..c718889902 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.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ #ifndef DARWIN_KEYBOARD_H #define DARWIN_KEYBOARD_H 1 diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index 4791ae31f5..a7f5f18ee5 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.2 2003/10/16 23:50:09 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h index 1e03cdf800..413dfd7e87 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/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.h,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ #ifndef _XFIOKIT_H #define _XFIOKIT_H diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c index 69eb41d2f2..f3c80145fc 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/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitCursor.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ #include "scrnintstr.h" #include "cursorstr.h" diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c index 80508775ee..9d25c69fea 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.1 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.2 2003/11/01 08:13:08 torrey Exp $ */ #include "darwin.h" #include "darwinKeyboard.h" diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h index feecf24d65..22a2f1441a 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.2 2003/01/15 02:34:05 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.3 2003/09/16 00:36:12 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/Preferences.m b/hw/darwin/quartz/Preferences.m index cca2f695df..4120b6360c 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.3 2003/05/14 05:27:56 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.m,v 1.4 2003/09/16 00:36:12 torrey Exp $ */ #import "quartzCommon.h" diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h index a2622e060c..3d3e96dab8 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: $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.h,v 1.2 2002/10/12 00:32:45 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/XApplication.m b/hw/darwin/quartz/XApplication.m index e0ee8d9c6c..9b81bbee04 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: $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XApplication.m,v 1.2 2002/10/12 00:32:45 torrey Exp $ */ #import "XApplication.h" diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c index 0adb4c2121..7b2c89f38b 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.1 2002/03/28 02:21:18 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.2 2003/05/14 05:15:56 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/XDarwinStartup.man b/hw/darwin/quartz/XDarwinStartup.man index 28efd1edfd..312f4b88b6 100644 --- a/hw/darwin/quartz/XDarwinStartup.man +++ b/hw/darwin/quartz/XDarwinStartup.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/darwin/bundle/XDarwinStartup.man,v 1.1 2002/02/05 19:16:14 torrey Exp $ +.\" $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.man,v 1.1 2002/03/28 02:21:18 torrey Exp $ .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 9d1ec1033a..01b8ec55e3 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.16 2003/11/23 06:04:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.17 2003/11/24 05:39:01 torrey Exp $ */ #define BOOL xBOOL #include "Xproto.h" diff --git a/hw/darwin/quartz/XServer.m b/hw/darwin/quartz/XServer.m index ffa2618d1a..56e6722045 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.19 2003/11/24 05:39:01 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.20 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index 9b62915c8d..d3e302727f 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.2 2003/09/16 00:36:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.3 2003/11/11 23:48:41 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h index 63e2bea9f9..650173941c 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.2 2003/11/11 23:48:41 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewmExt.h,v 1.3 2003/11/17 22:20:35 dawes Exp $ */ #ifndef _APPLEWMEXT_H_ #define _APPLEWMEXT_H_ diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h index 01f5b04b4c..666061dc12 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/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.h,v 1.1 2003/06/07 05:49:07 torrey Exp $ */ #import diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m index 5feac6b42e..2bf689ede3 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.1 2003/06/07 05:49:07 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/XView.m,v 1.2 2003/10/16 23:50:16 torrey Exp $ */ #import "XView.h" diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h index 94133e4afd..74752f7684 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$ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/cr.h,v 1.3 2003/11/03 05:36:31 tsi Exp $ */ #ifndef _CR_H #define _CR_H diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m index a2e97ff814..66e832b66b 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/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crAppleWM.m,v 1.1 2003/09/16 00:36:14 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m index 448d7cdeff..b308dec743 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.7 2003/11/27 01:53:39 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m index 1ed2727144..ab27e8eb8f 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.5 2003/11/12 20:21:52 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.6 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" #include "cr.h" diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index 99db7410a0..470528943d 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.3 2003/11/27 01:59:53 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */ #include "quartzCommon.h" #include "darwin.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c index 8abce2318f..72ad5ed8e4 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/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h index efcc4435e0..d822c3e868 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/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/quartzCursor.h,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c index 98b8b6fee0..4208309655 100644 --- a/hw/darwin/quartz/keysym2ucs.c +++ b/hw/darwin/quartz/keysym2ucs.c @@ -1,4 +1,4 @@ -/* $XFree86: $ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ * * 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 c7ff6f3b32..1d91834487 100644 --- a/hw/darwin/quartz/keysym2ucs.h +++ b/hw/darwin/quartz/keysym2ucs.h @@ -1,4 +1,4 @@ -/* $XFree86: $ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/keysym2ucs.h,v 1.1 2003/11/01 08:13:08 torrey Exp $ * * 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 dad735e1d1..2dd7c3ae56 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.2 2002/10/16 21:13:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */ #include "pseudoramiX.h" diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h index 3dcae622ad..23738cfb3c 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.1 2002/03/28 02:21:18 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */ extern int noPseudoramiXExtension; diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index 1c272df16d..91ca9fa28e 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.13 2003/11/12 20:21:51 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h index 69de6cf5ff..2cec61d664 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.7 2003/11/12 20:21:51 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.8 2003/11/27 01:59:53 torrey Exp $ */ #ifndef _QUARTZ_H #define _QUARTZ_H diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index 64a4f33cc7..a3e6af127f 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.1 2002/03/28 02:21:18 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.2 2003/05/14 05:27:56 torrey Exp $ */ #include "quartzCommon.h" #include "quartzAudio.h" diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h index e20c21ad24..1d213e36ad 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/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef _QUARTZAUDIO_H #define _QUARTZAUDIO_H diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/darwin/quartz/quartzCocoa.m index e12260bd2c..bba71c0418 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.3 2003/01/19 06:52:54 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.4 2003/05/14 05:27:56 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index faa827b37f..e3ae4b8503 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.13 2003/10/16 23:50:10 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.14 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZCOMMON_H #define _QUARTZCOMMON_H diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c index 711ce64f00..8abce2318f 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.4 2002/11/19 23:01:30 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h index 4db5531fab..9710d4be25 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/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index c434d227fd..eab86e27e1 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.1 2003/11/01 08:13:08 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index e9f9d66980..658832aa18 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/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.c,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #include "quartzPasteboard.h" diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h index 296c52c170..fef375493c 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/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzPasteboard.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef _QUARTZPASTEBOARD_H #define _QUARTZPASTEBOARD_H diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c index 5a11d53217..bb7c7d2142 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.8 2003/11/05 00:15:00 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.9 2003/11/15 00:07:09 torrey Exp $ */ #include #include diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h index e2e97b4c8d..8985f7b110 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.2 2003/05/02 00:08:49 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.3 2003/06/27 20:21:42 torrey Exp $ */ #ifndef XPLUGIN_H #define XPLUGIN_H 1 diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index 0eba61cb2e..3062d964a8 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/appledri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ /************************************************************************** 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 17f9e91a02..aa595af85c 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ /************************************************************************** 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 5d0b1fec85..350f61b566 100644 --- a/hw/darwin/quartz/xpr/dri.h +++ b/hw/darwin/quartz/xpr/dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dri.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ /************************************************************************** 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 ae1b99db53..1a2949b189 100644 --- a/hw/darwin/quartz/xpr/dristruct.h +++ b/hw/darwin/quartz/xpr/dristruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/dristruct.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index 632ffdb338..ad36204c53 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.1 2003/04/30 23:15:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #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 97d4cc40c3..2abb08cd73 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.1 2003/04/30 23:15:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #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 dcd34fdc54..3414e1543e 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: $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.c,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ #include "x-hook.h" #include diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h index 0b5e038fe5..14e8ca1f58 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: $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hook.h,v 1.1 2003/06/30 01:45:13 torrey Exp $ */ #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 17843362a6..859a5163d5 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.1 2003/04/30 23:15:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "x-list.h" #include diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h index 991e2b1f66..a65cfcb7c3 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.1 2003/04/30 23:15:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #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 63f45c5a20..b3091f8e15 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.4 2003/11/12 20:21:52 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ #ifndef XPR_H #define XPR_H diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index a5186d5f62..eca0de3342 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/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprAppleWM.c,v 1.1 2003/09/16 00:36:15 torrey Exp $ */ #include "xpr.h" #include "applewmExt.h" diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c index ee06043df7..a3dea69e26 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.1 2003/04/30 23:15:42 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.2 2003/09/16 00:36:15 torrey Exp $ */ #include "quartzCommon.h" #include "xpr.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index 3c5caa64c9..5521538521 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.4 2003/11/12 20:21:52 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.5 2003/11/27 01:59:53 torrey Exp $ */ #include "xpr.h" #include "rootlessCommon.h" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index aa7adb4bcc..771b7c9f4d 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.8 2003/11/12 20:21:52 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.9 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt index fb6d4399ef..94d61b1f04 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.1 2000/12/01 19:47:39 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $ diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c index 8f3340b155..a264cbc10d 100644 --- a/hw/darwin/utils/dumpkeymap.c +++ b/hw/darwin/utils/dumpkeymap.c @@ -1,4 +1,4 @@ -// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $ +// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.4 2003/04/13 14:52:51 herrb Exp $ //============================================================================= // // Copyright (C) 1999,2000 by Eric Sunshine diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man index 12983badaf..2ad6d54d21 100644 --- a/hw/darwin/utils/dumpkeymap.man +++ b/hw/darwin/utils/dumpkeymap.man @@ -30,7 +30,7 @@ // //============================================================================= // -// $XFree86$ +// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $ // .. .ig diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index fdece85d76..345526d190 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.9 2001/12/14 19:59:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.10 2003/11/16 03:16:59 dawes Exp $ */ #include "X11/X.h" #define NEED_EVENTS diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 59283bdf35..1e751a51d9 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -26,7 +26,17 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */ + +/* + * The screen origin code is: + * + * Copyright (c) 2004 by The XFree86 Project, Inc + * Rights as per the XFree86 1.1 licence + * (http://www.xfree86.org/legal/licenses.html). + * + */ + +/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.27 2004/03/05 03:20:48 dawes Exp $ */ #if defined(WIN32) #include @@ -80,7 +90,9 @@ typedef struct int width; int paddedBytesWidth; int paddedWidth; + int xOrigin; int height; + int yOrigin; int depth; int bitsPerPixel; int sizeInBytes; @@ -254,7 +266,7 @@ OsVendorFatalError() void ddxUseMsg() { - ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); + ErrorF("-screen n WxHxD[@x,y] set screen's width, height, depth, origin\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); #ifdef RENDER ErrorF("+/-render turn on/of RENDER extension support" @@ -288,6 +300,7 @@ ddxProcessArgument(int argc, char *argv[], int i) if (strcmp (argv[i], "-screen") == 0) /* -screen n WxHxD */ { int screenNum; + char *s; if (i + 2 >= argc) UseMsg(); screenNum = atoi(argv[i+1]); if (screenNum < 0 || screenNum >= MAXSCREENS) @@ -295,14 +308,31 @@ ddxProcessArgument(int argc, char *argv[], int i) ErrorF("Invalid screen number %d\n", screenNum); UseMsg(); } - if (3 != sscanf(argv[i+2], "%dx%dx%d", + s = strtok(argv[i+2], "@"); + if (3 != sscanf(s, "%dx%dx%d", &vfbScreens[screenNum].width, &vfbScreens[screenNum].height, &vfbScreens[screenNum].depth)) { - ErrorF("Invalid screen configuration %s\n", argv[i+2]); + ErrorF("Invalid screen configuration %s\n", s); UseMsg(); } + s = strtok(NULL, "@"); + if (s) + { + if (2 != sscanf(s, "%d,%d", + &vfbScreens[screenNum].xOrigin, + &vfbScreens[screenNum].yOrigin)) + { + ErrorF("Invalid screen position %s\n", s); + UseMsg(); + } + } + else + { + vfbScreens[screenNum].xOrigin = -1; + vfbScreens[screenNum].yOrigin = -1; + } if (screenNum >= vfbNumScreens) vfbNumScreens = screenNum + 1; @@ -1033,6 +1063,35 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv) } } + /* + * Setup the Xinerama Layout. If the screen origins are not specified + * explicitly, assume that screen n is to the right of screen n - 1. + * It is safe to set this up even when Xinerama is not used. + */ + + for (i = 0; i < vfbNumScreens; i++) + { + if (vfbScreens[i].xOrigin < 0 || vfbScreens[i].yOrigin < 0) + { + if (i == 0) + { + dixScreenOrigins[i].x = 0; + dixScreenOrigins[i].y = 0; + } + else + { + dixScreenOrigins[i].x = dixScreenOrigins[i - 1].x + + vfbScreens[i - 1].width; + dixScreenOrigins[i].y = dixScreenOrigins[i - 1].y; + } + } + else + { + dixScreenOrigins[i].x = vfbScreens[i].xOrigin; + dixScreenOrigins[i].y = vfbScreens[i].yOrigin; + } + } + } /* end InitOutput */ /* this is just to get the server to link on AIX */ diff --git a/hw/vfb/Xvfb.man.pre b/hw/vfb/Xvfb.man.pre index 64b6ea48d1..5e7168a1c4 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.9 2001/12/14 19:59:45 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.11 2004/03/05 03:20:48 dawes Exp $ .\" .TH XVFB 1 __xorgversion__ .SH NAME @@ -58,30 +58,32 @@ To build \fIXvfb\fP, put the following in your host.def and remake. In addition to the normal server options described in the \fIXserver(1)\fP manual page, \fIXvfb\fP accepts the following command line switches: .TP 4 -.B "\-screen \fIscreennum\fP \fIWxHxD\fP" +.B "\-screen \fIscreennum\fP \fIW\fPx\fIH\fPx\fID\fP\fR[\fP@\fIx\fP,\fIy\fP\fR]\fP" This option creates screen \fIscreennum\fP and sets its width, height, -and depth to W, H, and D respectively. By default, only screen 0 exists -and has the dimensions 1280x1024x8. +and depth to W, H, and D respectively, and optionally the screen origin +(for Xinerama purposes) to (x,y). By default, only screen 0 exists and +has the dimensions 1280x1024x8. If a screen origin is not specified +when using Xinerama, the default is for screen +.I N +to be positioned to the right of screen +.IR N\-1 . .TP 4 .B "\-pixdepths \fIlist-of-depths\fP" This option specifies a list of pixmap depths that the server should support in addition to the depths implied by the supported screens. -\fIlist-of-depths\fP is a space-separated list of integers that can -have values from 1 to 32. +\fIlist-of-depths\fP is a space-separated list of integers that can have +values from 1 to 32. .TP 4 .B "\-fbdir \fIframebuffer-directory\fP" This option specifies the directory in which the memory mapped files -containing the framebuffer memory should be created. -See FILES. -This option only exists on machines that have the mmap and msync system -calls. +containing the framebuffer memory should be created. See FILES. This +option only exists on machines that have the mmap and msync system calls. .TP 4 .B "\-shmem" -This option specifies that the framebuffer should be put in shared memory. -The shared memory ID for each screen will be printed by the server. -The shared memory is in xwd format. -This option only exists on machines that support the System V shared memory -interface. +This option specifies that the framebuffer should be put in shared +memory. The shared memory ID for each screen will be printed by the +server. The shared memory is in xwd format. This option only exists +on machines that support the System V shared memory interface. .PP If neither \fB\-shmem\fP nor \fB\-fbdir\fP is specified, the framebuffer memory will be allocated with malloc(). diff --git a/hw/xfree86/common/extramodes b/hw/xfree86/common/extramodes index 1d72861e41..f7dc012164 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.5 2002/06/05 19:43:05 dawes Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $ // # 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 abe995550c..e31fe28e17 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.10tsi Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $ #my %flagshash; $flagshash{""} = "0"; diff --git a/hw/xfree86/common/vesamodes b/hw/xfree86/common/vesamodes index 851643fa64..d2df5931a1 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.3 1999/11/16 03:28:03 tsi Exp $ +// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $ # 640x350 @ 85Hz (VESA) hsync: 37.9kHz diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 92651ee9b6..8f6dd2803a 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.276 2003/10/08 14:58:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */ /* diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 8b41cfd241..3dde4ba7d0 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.80 2003/10/08 14:58:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */ /* * 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 11f88f2e19..5e4bc29b6a 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.46 2002/12/03 18:17:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index 1d6d332ec7..7257b204b7 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */ /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at * modeline2c.pl */ diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index 3b7551fc58..fbbafd8af0 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.7.4.2 1998/06/04 17:35:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */ /* ***************************************************************************** * HISTORY diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 3d76ab1189..546c909ff8 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.7tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $ * * 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 801f2bafe1..87042cb14b 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.6 2001/03/03 22:16:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */ #include #include diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 81c1b84ac6..0816c63a16 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.4 2001/10/28 03:33:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */ #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index db19e14424..eedf47b8ba 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: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.38 2004/02/19 22:38:12 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 33fedeb0ff..facc278429 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.5 2000/11/06 19:24:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */ /* 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 39ae2ee110..7b5e26a23a 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */ #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/ddc/DDC.HOWTO b/hw/xfree86/ddc/DDC.HOWTO index 833a7ab545..2f2c95b7f6 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.2 1998/12/06 13:30:39 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.3 1999/09/25 14:37:16 dawes Exp $ diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 9b68b81bbb..666dfc6328 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -3,7 +3,7 @@ * * Copyright 1999 by Andrew C Aitchison */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index 58616d308b..a61940cfa5 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.3 2000/11/03 18:46:08 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */ /* 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 ccf9d9280c..7a2f30cb49 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.6 2000/04/17 16:29:55 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */ /* 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 bf2509c95f..c0092aed90 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.7 2000/04/17 16:29:55 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */ /* 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 ac479d3260..acd931e709 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.5 1999/12/03 19:17:26 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */ #include "Xarch.h" #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 29f4183984..0645338000 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.15 2001/05/22 17:01:23 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */ /* 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 caea5caa19..fbb540e1d9 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */ #include "vdif.h" #include "misc.h" diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 7a647031ad..8d358613e4 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */ #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 123bb492e9..496f3573f1 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.26 2003/08/22 17:56:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */ /* xf86DDC.c * diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index ae2e26641b..b4252ef6b6 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.10 2000/06/07 22:03:09 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */ /* xf86DDC.h * diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c index 422da4820f..9369db1f22 100644 --- a/hw/xfree86/dixmods/GLcoremodule.c +++ b/hw/xfree86/dixmods/GLcoremodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c index 914678b71f..f9dcc8477c 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.6 1999/01/26 05:53:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index 229efa446b..a0108053c7 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.21 2000/06/30 19:06:54 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.22 2003/07/16 01:38:29 dawes Exp $ */ #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index a27fa5994b..dc76cbf21b 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.16 2002/03/06 21:12:33 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.17 2003/07/16 01:38:33 dawes Exp $ */ /* * diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index fadd97be55..cc717c31bd 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.1 2003/07/16 01:38:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */ #ifndef INITARGS #define INITARGS void diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h index 99bac9daca..57a7872f02 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.4 1999/12/13 01:39:40 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.5 2001/05/06 00:51:19 mvojkovi Exp $ */ /* 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 4565f58603..973f54e235 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.21 2000/06/30 19:06:54 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.22 2003/07/16 01:38:30 dawes Exp $ */ /* diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 5ad75258ec..2556743bbe 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.17 2001/10/28 03:32:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.18 2003/07/16 01:38:30 dawes Exp $ */ #define NEED_REPLIES diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h index a823e28f28..831108399f 100644 --- a/hw/xfree86/dixmods/extmod/xf86dgaext.h +++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dgaext.h,v 1.1 2003/07/16 01:38:30 dawes Exp $ */ #ifndef _XF86DGAEXT_H_ #define _XF86DGAEXT_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h index 3dab4277a4..208260947c 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.5 2002/11/20 04:04:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.6 2003/04/03 16:15:47 dawes Exp $ */ /* 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 2d95d15a4f..f4751a1c71 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.58 2003/11/06 18:37:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.59 2003/11/17 22:20:27 dawes Exp $ */ /* diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 0395ba877e..4a9c461f62 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.1 1998/08/13 14:45:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h index e08aef7f9e..2dcbd472a0 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.2 2001/03/05 04:51:55 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.3 2001/04/08 16:33:22 dawes Exp $ */ #include "xvmcext.h" diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index eb8e54f263..f449d55ecf 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.11 2001/06/15 21:22:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glxmodule.c,v 1.12 2003/09/28 20:15:40 alanh Exp $ */ /* * Authors: diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c index 274e68b2e0..60b6bcfa08 100644 --- a/hw/xfree86/dixmods/laymodule.c +++ b/hw/xfree86/dixmods/laymodule.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c index bd10221930..acafc456d9 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.5 1999/01/26 05:54:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c index d24f8a823d..44aef65ce3 100644 --- a/hw/xfree86/dixmods/shmodule.c +++ b/hw/xfree86/dixmods/shmodule.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shmodule.c,v 1.1 2000/09/03 05:07:24 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c index 65062108ec..07283cdb73 100644 --- a/hw/xfree86/dixmods/xf86XTrapModule.c +++ b/hw/xfree86/dixmods/xf86XTrapModule.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/XTrap/xf86XTrapModule.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ /* 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 e3daac059b..e663f2928e 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: $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.22 2003/07/15 02:28:28 dawes Exp $ diff --git a/hw/xfree86/doc/README.fonts b/hw/xfree86/doc/README.fonts index ea9628a4b2..2fe8dfaacc 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: $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.28 2003/12/20 19:47:28 dawes Exp $ diff --git a/hw/xfree86/doc/README.rapidaccess b/hw/xfree86/doc/README.rapidaccess index d19eb81c62..a78dfb9bce 100644 --- a/hw/xfree86/doc/README.rapidaccess +++ b/hw/xfree86/doc/README.rapidaccess @@ -45,4 +45,4 @@ Dennis Bj -$XFree86$ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rapidaccess,v 1.1 2001/05/18 23:35:32 dawes Exp $ diff --git a/hw/xfree86/doc/changelogs/CHANGELOG b/hw/xfree86/doc/changelogs/CHANGELOG index 8c19544526..d9b4eb16b1 100644 --- a/hw/xfree86/doc/changelogs/CHANGELOG +++ b/hw/xfree86/doc/changelogs/CHANGELOG @@ -1,3 +1,41 @@ +XFree86 4.4.99.2 (xx March 2004) + +XFree86 4.4.99.1 (12 March 2004) + 18. IRIX allows for a relatively low number of command arguments, so break up + font clean rules accordingly (Marc La France). + 17. Change radeon driver to save/restore colour lookup tables + (Marc La France). + 16. Fix ix86 pre-Solaris8 mmap() problems by deleting obsolete code + (Marc La France). + 15. Fix build glitch on SunOS SPARC (Marc La France). + 14. Clean up constype utility used on SPARC's (Marc La France). + 13. Experimental changes to recognise parameterised macros in makedepend + (From #6003, Alexander Stohr). + 12. Change scanpci utility to optionally display PCI bus linkages + (Marc La France). + 11. Fixes for building on Solaris/sparc with Sun's compiler (Mark Kandianis). + 10. Add support for specifying the screen origins for Xvfb, which is + useful when Xinerama is enabled (David Dawes). + 9. Fix X-Resource extension server crash when the client and server hosts + have different endianness (Bugzilla #1242, Alan Coopersmith). + 8. Fix an off-by-one error that can lead to malloc problems (Bugzilla #512, + Kyle Bateman). + 7. Xterm patch #185 (Thomas Dickey). + 6. Do the Linux KDKBDREP ioctl on the correct fd. This prevents the + fallback that tries to directly program the keyboard repeat rate, + and the related warning messages that recent Linux kernels generate + (David Dawes). + 5. Turn off the DAC for Radeon DPMS modes. Without this some monitors + can be badly affected. (Bugzilla #1221, Hui Yu@ATI, reported by + Paul Shupak). + 4. VeraIt.ttf wasn't getting installed (Bugzilla #1226, Matthieu Herrb). + 3. Fix an attempted free of an invalid pointer in ScreenSaverSetAttributes() + (Bugzilla #1224, Matthieu Herrb, David Dawes). + 2. Fix a build problem when build server side GL libraries on a system + with no installed X headers (Alan Hourihane). + 1. Fix HTML man page index generation to handle recent rman changes + (David Dawes). + XFree86 4.4.0 (29 February 2004) 821. Fix Radeon secondary head register initialization (Hui Yu@ATI, Benjamin Herrenschmidt). @@ -18683,7 +18721,7 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3156 2004/02/29 04:25:24 martin Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3173 2004/03/12 12:09:11 dawes Exp $ diff --git a/hw/xfree86/doc/changelogs/CHANGELOG.ND b/hw/xfree86/doc/changelogs/CHANGELOG.ND index 5f0d87780d..3c9e1e1f69 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.2 1998/07/31 10:41:14 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.3 1998/08/02 05:16:54 dawes Exp $ diff --git a/hw/xfree86/doc/devel/Domain.note b/hw/xfree86/doc/devel/Domain.note index ce0812b22b..3db2aefae9 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$ +$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $ diff --git a/hw/xfree86/doc/devel/README.DRIcomp b/hw/xfree86/doc/devel/README.DRIcomp index 7dab2b1089..0f1bd1b694 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: $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.17 2003/07/15 02:28:28 dawes Exp $ diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry index d766221570..9c41113481 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.18 2002/04/06 18:31:09 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.19 2003/02/20 04:05:12 dawes Exp $ diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml index 0478a05981..864b5c249e 100644 --- a/hw/xfree86/doc/sgml/DESIGN.sgml +++ b/hw/xfree86/doc/sgml/DESIGN.sgml @@ -36,7 +36,7 @@ -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.53 2003/08/23 14:10:14 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.54 2003/12/19 20:38:57 dawes Exp $ diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index acef4c54b0..551a3c2a8e 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.39 2003/11/10 18:21:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.40 2004/01/30 14:31:58 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 1495344171..80602d3dd1 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.18 2001/03/21 16:21:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.19 2002/10/30 12:52:03 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 33641fa435..bb7a89ee04 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.5 2001/06/15 21:22:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.6 2001/12/10 19:07:19 dawes Exp $ */ /* * Authors: diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index 6d90d770a4..e733ac2109 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.12 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.13 2002/11/20 18:10:24 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h index d4d83df930..fcb4b59bd6 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.11 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */ /** * \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.11 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.12 2003/09/28 20:15:41 alanh Exp $ */ #ifndef _SAREA_H_ #define _SAREA_H_ diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index bc8a17ad20..3df0cca595 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.12 2002/12/14 01:36:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.13 2003/09/24 02:43:12 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dummylib/README b/hw/xfree86/dummylib/README index 4e270307a3..8e5b539a69 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$ +$XFree86: xc/programs/Xserver/hw/xfree86/dummylib/README,v 1.1 2000/02/13 03:06:38 dawes Exp $ diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index 5835446bff..d8a0d285a8 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.1 2000/02/13 03:06:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ #ifndef _DUMMY_LIB_H #define _DUMMY_LIB_H diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index ec437d8df6..3c482b480e 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/fatalerror.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index c1b0fa9881..a16126842a 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.1 2000/02/13 03:06:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.3 2001/05/15 10:19:41 eich Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 6b910d5b35..75634d7f3d 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/logvwrite.c,v 1.1 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index d6e5c65a1e..4259f678e1 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/pcitestmulti.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index 30bc93e71d..e36a590e77 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorf.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 4b7226e170..63d3ff8c71 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.1 2000/02/13 03:06:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.2 2002/11/09 09:00:13 herrb Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index 006a6382ae..ea24fc1dca 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.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.3 2002/12/24 15:50:43 tsi Exp $ */ #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index f0cb2e1271..1f61eda4dc 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86allocscripi.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index c6f8e523f1..5780d9c134 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.1 2000/02/13 03:06:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index f6164a8da2..b7c0ddb537 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.1 2000/02/13 03:06:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 33f05ec9c6..122f46d435 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.2 2000/05/31 07:15:05 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 4ad5a1a515..61c3e02a2c 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.1 2000/02/13 03:06:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 50701741fb..51b785a73e 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getpagesize.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 410d7b6454..a4255698f8 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index d488d36156..d7b95b4306 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86info.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index e002948a2d..2d36bea973 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.1 2000/02/13 03:06:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index 308f6230d3..f460b6b9f9 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.1 2000/02/13 03:06:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index b660d45b3c..dd00635b0a 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.1 2000/02/13 03:06:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.2 2001/05/04 19:05:50 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 8d95914429..031b6e55ab 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86screens.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 2f959a95c6..8339c658b6 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86servisinit.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 1f4614ba3b..877bd6fd75 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86verbose.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 0345aa41f6..752cdb0448 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.32 2003/08/26 10:57:03 daenzer Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */ /* all driver need this */ #include "xf86.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index 219ca07d32..cfc47f9055 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.11 2001/10/01 13:44:12 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.12 2003/10/30 17:37:16 tsi Exp $ */ #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhw.man.pre b/hw/xfree86/fbdevhw/fbdevhw.man.pre index e1ebe5c51f..dadc1f9a36 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.1 2001/01/24 00:06:34 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ .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 dc1169362a..b262be90fb 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.12 2001/10/28 03:33:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */ #include "xf86.h" #include "xf86cmap.h" diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index f4017fb2ae..d651e5129d 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.2 2000/01/21 02:30:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.3 2000/08/11 17:27:14 dawes Exp $ */ #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 79db0b1004..fcf1a61619 100644 --- a/hw/xfree86/getconfig/cfg.man.pre +++ b/hw/xfree86/getconfig/cfg.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.1 2003/11/12 04:52:15 dawes Exp $ .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 62d06ad38d..acf262d1a0 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.1 2003/10/08 14:58:29 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/11/12 04:52:15 dawes Exp $ # Some sample XFree86 getconfig rules file. diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre index 6b43047c3a..16c472fc52 100644 --- a/hw/xfree86/getconfig/getconfig.man.pre +++ b/hw/xfree86/getconfig/getconfig.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $ .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 55a6cb0595..a7f5adf1a2 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -6,7 +6,7 @@ * (c) 1998 Gerd Knorr */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */ #if 1 #include "misc.h" diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index b6ef41febf..e7423155ac 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.10 2003/07/16 01:38:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */ #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c index 8f0c56f59e..de923b2f05 100644 --- a/hw/xfree86/i2c/xf86i2cmodule.c +++ b/hw/xfree86/i2c/xf86i2cmodule.c @@ -5,7 +5,7 @@ * (c) 1998 Gerd Knorr */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.7 1999/04/11 13:11:02 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO index e2154c1c31..bba0c774fa 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.2 2000/02/08 13:13:22 eich Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.3 2001/04/30 14:34:57 tsi Exp $ diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 01bb4c30a8..845c8a1774 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.28 2003/09/08 14:25:30 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */ /* * 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 76c2a1e3d9..181ebb157c 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.26 2003/11/06 18:38:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.27 2003/12/23 22:32:38 tsi Exp $ */ /* * 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 c0433773dc..6de89c5d92 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.25 2002/09/16 18:06:08 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.26 2002/11/25 14:05:01 eich Exp $ */ /* * 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 7c95171d43..debd842e71 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.11 2001/10/01 13:44:13 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.12 2002/04/04 14:05:51 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index c54de2461d..f6b38580c6 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.2 2000/02/12 03:39:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.4 2002/04/04 14:05:51 eich Exp $ */ /* * 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 e88c6500d5..a74bbeacd1 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.11 2003/03/21 22:26:11 tsi Exp $ */ /* * 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 c17e95d160..843902c5e9 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.23 2002/04/04 14:05:51 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.24 2002/07/23 14:22:46 tsi Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c index 5857d23d2b..9e679ca6a0 100644 --- a/hw/xfree86/int10/xf86int10module.c +++ b/hw/xfree86/int10/xf86int10module.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10/xf86int10module.c,v 1.3 1999/12/03 19:17:41 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10module.c,v 1.2 2002/09/16 18:06:09 eich Exp $ */ /* * 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 ffee4fb9a6..6998a08807 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.11 2001/04/30 14:34:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.13 2002/09/16 18:06:09 eich Exp $ */ /* * 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 27ff6fc142..67c37d5f4b 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.1 2000/01/23 04:44:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.2 2001/01/06 20:19:13 tsi Exp $ */ /* * 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 11139d192d..e7281593c5 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/os-support/misc/SparcMulDiv.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/SparcMulDiv.S,v 1.1 2000/11/02 19:10:54 dawes Exp $ */ .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 0fe454e978..cd78075315 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.7 2002/05/31 18:46:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aout.h,v 1.8 2003/10/15 16:29:02 dawes Exp $ */ /* * Borrowed from NetBSD's exec_aout.h diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index 0a48779779..f77b3d73c3 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.19 2003/10/15 16:58:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.c,v 1.20 2003/10/15 17:46:00 dawes Exp $ */ /* * diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h index 7aeaf41fe2..b0e1563193 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.3 1998/09/20 14:41:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ #ifndef _AOUTLOADER_H #define _AOUTLOADER_H diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h index 3129d1c72b..956b810a0c 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.3 1998/07/25 16:56:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ #ifndef _AR_H #define _AR_H diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h index 54a8cb57fd..52553278ee 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.5 1998/07/25 16:56:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coff.h,v 1.6 2003/10/15 16:29:02 dawes Exp $ */ /* 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 164c7d167e..1ba45dd671 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.21tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.c,v 1.22 2003/12/22 17:48:11 tsi Exp $ */ /* * diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h index 3d67284811..2174746711 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.3 1998/09/20 14:41:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.4 2003/10/15 16:29:02 dawes Exp $ */ #ifndef _COFFLOADER_H #define _COFFLOADER_H diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index 51f0520e66..e9468e97b3 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.2 1998/07/25 16:56:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ #ifndef _DLLOADER_H #define _DLLOADER_H diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h index a523eac845..91130e63d0 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.16 2003/06/12 14:12:34 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elf.h,v 1.17 2003/10/15 16:29:02 dawes Exp $ */ 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 46172fdff8..5ab8af62db 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.61tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.62 2003/11/06 18:38:13 tsi Exp $ */ /* * diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h index 0a42d70602..e4693411bc 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.3 1998/09/20 14:41:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.4 2003/10/15 16:29:03 dawes Exp $ */ #ifndef _ELFLOADER_H #define _ELFLOADER_H diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index e8e92cb163..03f415c224 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.24 2003/11/17 22:20:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.25 2003/11/23 00:57:56 dawes Exp $ */ /* * diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h index 88b525669a..96cd41c025 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.2.2.2 1998/07/04 13:32:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.3 1998/07/25 16:56:16 dawes Exp $ */ #ifndef _HASH_H #define _HASH_H diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h index 0e18959c3b..e937b9f08e 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.6 2000/10/24 00:06:55 anderson Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/sym.h,v 1.7 2003/10/15 16:29:04 dawes Exp $ */ /* * diff --git a/hw/xfree86/os-support/README.OS-lib b/hw/xfree86/os-support/README.OS-lib index 43312e4e8a..27af6b3f25 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.9 2001/07/23 13:15:48 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib,v 3.10 2001/12/17 20:00:45 dawes Exp $ diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index bab184e7cc..5a7b521171 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: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.7 2004/02/17 21:33:08 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index cfea026023..36943add12 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.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.2 2003/03/14 13:46:03 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 9702ff0c7a..6c675b5da0 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.6 2001/02/16 14:45:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.9 2003/10/02 13:30:06 eich Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c index c0a8f88907..a47dc23844 100644 --- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c +++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_KbdMap.c,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ /* * 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 ea3271629a..adb101dc5a 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.5.4.3 1998/06/05 16:23:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.6 1998/07/25 16:56:33 dawes Exp $ */ /* * Derived from VTsw_usl.c which is * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index 6ed48d89b6..250e5cb554 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_apm.c,v 1.1 2000/02/29 03:09:25 dawes Exp $ */ #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 0f392a8a02..91367078eb 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,4 +1,4 @@ -/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_axp.c,v 1.3 2003/10/07 22:33:37 herrb Exp $ */ #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 2952e94013..ec95306e88 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.1 2000/03/05 16:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.2 2001/02/27 23:05:00 alanh Exp $ */ #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 c76c9f7485..e4927d91a7 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.21 2003/09/24 02:43:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.22 2003/10/07 23:14:55 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index d4689ce212..0f40ba7075 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.22 2002/05/18 21:15:16 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.23 2002/10/21 20:38:04 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 93626b6f81..7f24124dcf 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 */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.8 2002/08/06 13:20:47 herrb Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 871bd2411b..3c22eeb4d2 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.8 2003/11/04 03:16:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.9 2004/01/07 17:05:28 tsi Exp $ */ /* * 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 7b9cd434e2..c042d88bff 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.h +++ b/hw/xfree86/os-support/bsd/bsd_kbd.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ 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 37139e8dd9..74345654b5 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 3c55ee72f6..75c8f82001 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.4 2003/09/24 02:43:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.5 2003/10/07 23:14:55 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index 3d88b075f9..bb84e5566e 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/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index a3bc237dc9..f754189645 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/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ #include diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index 8e1c802c97..8c1a8b8a29 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/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index eb51a2fcca..9338e61d46 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/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bsd/libusb/usb.3 b/hw/xfree86/os-support/bsd/libusb/usb.3 index db0b1b08f4..f88a28cd64 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/libusb/usb.3,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.3,v 1.1 2000/02/11 18:06:50 dawes Exp $ .\" .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 445428118a..69ef79a623 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/libusb/usb.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ #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 48c7b1351b..711ba206a2 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/libusb/usb_hid_usages,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb_hid_usages,v 1.1 2000/02/11 18:06:51 dawes Exp $ # 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 60883dd47c..cb0bf33ecc 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/libusb/usbvar.h,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ 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 f1d22f4fae..99be9ea2f5 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */ #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 af2867f905..3e4ff9ee74 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -1,4 +1,4 @@ -/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/ppc_video.c,v 1.6 2003/10/07 23:14:55 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index 760bf78b35..fe301acf53 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -1,4 +1,4 @@ -/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/sparc64_video.c,v 1.3 2003/10/07 23:14:55 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index f81112474f..57262efa25 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.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.4 2003/10/02 13:30:06 eich Exp $ */ #include #include diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index d218a0d2f2..04ff8b9567 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.14 2002/12/11 02:44:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */ /* * 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 3b2bf5a9b5..06baa69ea2 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.4 2002/07/24 19:06:52 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.6 2003/10/02 13:30:07 eich Exp $ */ /* * 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 4846ee0ed4..76194802f3 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.9 2002/09/24 16:14:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.10 2002/11/17 18:42:01 alanh Exp $ */ /* * 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 7b00acb6bf..2aa98355b9 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.8 2002/07/24 19:06:52 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.9 2002/08/27 22:07:07 tsi Exp $ */ /* * 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 dbd17810f1..28ab90491e 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.3 2001/04/20 17:02:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.7 2004/03/08 15:37:12 tsi Exp $ */ #ifndef _XF86_SBUS_H #define _XF86_SBUS_H @@ -47,19 +47,22 @@ #endif #ifndef FBTYPE_SUNGP3 -#define FBTYPE_SUNGP3 -1 +#define FBTYPE_SUNGP3 17 #endif -#ifndef FBTYPE_MDICOLOR -#define FBTYPE_MDICOLOR -1 +#ifndef FBTYPE_SUNGT +#define FBTYPE_SUNGT 18 #endif #ifndef FBTYPE_SUNLEO -#define FBTYPE_SUNLEO -1 +#define FBTYPE_SUNLEO 19 +#endif +#ifndef FBTYPE_MDICOLOR +#define FBTYPE_MDICOLOR 20 #endif #ifndef FBTYPE_TCXCOLOR -#define FBTYPE_TCXCOLOR -1 +#define FBTYPE_TCXCOLOR 21 #endif #ifndef FBTYPE_CREATOR -#define FBTYPE_CREATOR -1 +#define FBTYPE_CREATOR 22 #endif #endif /* _XF86_SBUS_H */ diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c index 8192e97eb5..8be822445b 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $ * */ diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index 390ab28686..f2a5d2053d 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: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.33 2004/02/25 12:53:15 eich Exp $ */ /* * 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 e9cb6125aa..dc737ac479 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$ */ +/* $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 $ */ #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 b2adcd5142..f2dd16267f 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,4 +1,4 @@ -/* $XFree86: Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx.h,v 3.3 2002/11/25 14:05:04 eich Exp $ */ #ifndef LNX_H_ # ifdef __alpha__ diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index 25ef8cc910..bd038351f4 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.18 2002/01/25 21:56:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.19 2004/02/04 16:30:50 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c index 993679d81b..25639d72dd 100644 --- a/hw/xfree86/os-support/linux/lnx_KbdMap.c +++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_KbdMap.c,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ /* * 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 58f1062da6..acac20bce5 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.11 2003/04/03 22:47:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.12 2003/09/24 02:43:35 dawes Exp $ */ #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 1f9142a6ba..f2f3269591 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.12 2001/12/24 22:54:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.13 2002/10/16 01:24:28 dawes Exp $ */ #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 106aa28042..5813ef4e9a 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.3 2001/02/15 11:03:56 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.5 2002/11/25 14:05:04 eich Exp $ */ #include #include "X.h" diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index 8381fec27f..bfcb0d70fc 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.5 2000/02/17 13:45:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.7 2002/11/25 14:05:04 eich Exp $ */ #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 7835cd1c58..cbc926bc0f 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.14 2001/10/31 22:50:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.15 2003/12/02 20:45:13 dawes Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index cef6f9747c..8fa27aa08f 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.25 2003/08/19 17:32:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.27 2004/03/03 18:53:41 dawes Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Dawes @@ -81,7 +81,7 @@ xf86GetKbdLeds() #endif static int -KDKBDREP_ioctl_ok(int rate, int delay) { +KDKBDREP_ioctl_ok(int fd, int rate, int delay) { #if defined(KDKBDREP) && !defined(__sparc__) /* This ioctl is defined in but is not implemented anywhere - must be in some m68k patches. */ @@ -90,7 +90,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { /* don't change, just test */ kbdrep_s.rate = -1; kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { return 0; } @@ -105,7 +105,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { return 0; } @@ -174,7 +174,7 @@ void xf86SetKbdRepeat(char rad) delay = xf86Info.kbdDelay; - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */ + if(KDKBDREP_ioctl_ok(xf86Info.consoleFd, rate, delay)) /* m68k? */ return; if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */ diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 90a8bc1061..2423bd45ef 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.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */ 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 d120f921cc..c0ebc86b66 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.4 2003/11/03 05:11:52 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.6 2004/03/03 18:53:41 dawes Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. @@ -108,7 +108,7 @@ GetKbdLeds(InputInfoPtr pInfo) #endif static int -KDKBDREP_ioctl_ok(int rate, int delay) { +KDKBDREP_ioctl_ok(int fd, int rate, int delay) { #if defined(KDKBDREP) && !defined(__sparc__) /* This ioctl is defined in but is not implemented anywhere - must be in some m68k patches. */ @@ -117,7 +117,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { /* don't change, just test */ kbdrep_s.rate = -1; kbdrep_s.delay = -1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { return 0; } @@ -132,7 +132,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; - if (ioctl( 0, KDKBDREP, &kbdrep_s )) { + if (ioctl( fd, KDKBDREP, &kbdrep_s )) { return 0; } @@ -200,7 +200,7 @@ SetKbdRepeat(InputInfoPtr pInfo, char rad) if (pKbd->delay >= 0) delay = pKbd->delay; - if(KDKBDREP_ioctl_ok(rate, delay)) /* m68k? */ + if(KDKBDREP_ioctl_ok(pInfo->fd, rate, delay)) /* m68k? */ return; if(KIOCSRATE_ioctl_ok(rate, delay)) /* sparc? */ diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h index 7b9cd434e2..ac783bfbcf 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.h +++ b/hw/xfree86/os-support/linux/lnx_kbd.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ 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 cf18bcab65..0cb69b2091 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.5 2001/10/01 13:44:14 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */ #include #include diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 41f76fd16e..5477b9130d 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.8 2002/04/09 15:59:37 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.9 2003/02/17 15:29:22 dawes Exp $ */ #include #include "X.h" diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 5144cdf3e4..ad3a17fa22 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.67 2003/06/25 18:27:07 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.68 2003/09/24 02:43:35 dawes Exp $ */ /* * Copyright 1992 by Orest Zborowski * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 1787a7c8c9..8565dcc5c3 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.2 1998/07/25 16:56:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.3 1998/08/29 05:43:58 dawes Exp $ */ #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 3ace8f447a..e61ce76b70 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.9 2002/10/11 01:40:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.10 2003/02/17 15:11:57 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index fd45ba4ec6..dcf734965e 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.5 1998/08/29 05:43:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.6 2000/02/11 22:36:02 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 7d6bedec94..858b0eb650 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.5 2000/07/31 23:25:18 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */ /* * 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 12fa3bcae0..e587b7ee06 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.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */ /* * 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 297d93bdfb..c667994b30 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.17 2000/10/28 01:42:27 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.18 2002/12/14 04:41:14 dawes Exp $ */ #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 83dab6f677..e4ff36c628 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.2 1998/07/25 16:56:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S,v 1.1 1999/07/10 07:24:49 dawes Exp $ */ /****************************************************************************** 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 27d53fa8fe..acef268a13 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.3 1999/12/03 19:17:44 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.4 2000/02/12 20:45:44 dawes Exp $ */ #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 ce99e792a2..b5de1d899a 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.3 2000/12/08 20:13:38 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.4 2003/03/25 04:18:23 dawes Exp $ */ #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 6855846530..4c6e32f3fe 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.2 1998/07/25 16:56:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S,v 1.1 1999/07/10 07:24:50 dawes Exp $ */ /******************************************************************************* 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 e14a86f919..57176c5d5d 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.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.3 2000/08/04 16:13:41 eich Exp $ */ #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 75db31156a..e919c05e7f 100644 --- a/hw/xfree86/os-support/misc/PortIO.S +++ b/hw/xfree86/os-support/misc/PortIO.S @@ -1,7 +1,9 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S,v 1.2 2004/03/05 04:02:14 dawes Exp $ */ /* Port I/O functions for platforms with no inlining. */ +#if defined(i386) + #include "assyntax.h" FILE("PortIO.s") @@ -55,3 +57,61 @@ GLNAME(inl): IN_L RET +#elif defined(sparc) + +#ifndef ASI_PL +#define ASI_PL 136 +#endif + + .file "PortIO.s" + + .global outb + .global outw + .global outl + .global inb + .global inw + .global inl + + .section ".text" + + .align 4 +outb: + stba %o1, [%o0] ASI_PL + membar 10 + retl + nop + + .align 4 +outw: + stha %o1, [%o0] ASI_PL + membar 10 + retl + nop + + .align 4 +outl: + sta %o1, [%o0] ASI_PL + membar 10 + retl + nop + + .align 4 +inb: + lduba [%o0] ASI_PL, %o0 + retl + nop + + .align 4 +inw: + lduha [%o0] ASI_PL, %o0 + retl + nop + + .align 4 +inl: + lda [%o0] ASI_PL, %o0 + retl + nop + +#endif + diff --git a/hw/xfree86/os-support/misc/SlowBcopy.S b/hw/xfree86/os-support/misc/SlowBcopy.S index 9fd73a0f99..9b6af1d69f 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.2 1998/07/25 16:56:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */ /******************************************************************************* 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 727ec65989..a9a8beae79 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.7 2004/02/11 22:06:21 tsi Exp $ */ /* * 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 4172d3d394..0191563575 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.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */ /* * 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 1b73dc654d..7889617e32 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.7 1999/01/14 13:05:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.8 2001/10/28 03:34:02 tsi Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index d4ae2852fe..899c3820b4 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.2 1998/07/25 16:56:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.4 2003/07/07 15:34:27 eich Exp $ */ /* * Copyright 1993 by David Wexelblat * Copyright 1993 by David McCullough diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 2b8a05be5f..389664647e 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.13 2002/06/03 21:22:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.14 2002/11/20 23:00:44 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index c9b7219cdd..a018e34343 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.9 2002/10/11 01:40:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.10 2003/02/17 15:11:59 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 9138843852..85b4bbd41a 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_iop.c,v 1.1 2002/06/03 21:22:10 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 445afe8223..37b9eb5a8b 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.12 2001/06/30 22:41:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.13 2002/11/20 23:07:50 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index a11d957e1a..3c00f55645 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.8tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.9 2003/03/14 13:46:07 tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston * diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 6267da9a71..265a45f91c 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.1.4.1 1998/06/05 16:23:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.2 1998/07/25 16:56:59 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 4ddb844504..81aac54dee 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.1.4.1 1998/06/05 16:23:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.4 2002/09/16 18:06:14 eich Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index c295c21468..5c24b97510 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.5 1998/09/13 00:51:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.7 2000/09/19 12:46:22 eich Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index 8f341e5e49..ee7584222e 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.8 2000/11/19 16:38:06 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.9 2001/05/23 14:46:05 alanh Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/inout.S b/hw/xfree86/os-support/shared/inout.S index 73a2cbbb60..80c47c4192 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 3.5 1996/12/23 06:50:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.S,v 1.1 1999/07/10 07:24:52 dawes Exp $ */ #include "assyntax.h" diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index fc1e832559..c24f4f1b24 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.3 1998/07/25 16:57:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.4 2001/07/23 13:15:48 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat * diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index 934ebbdbaa..329346910d 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.2 1998/07/25 16:57:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.3 1999/05/07 02:56:23 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 8e118938e7..1bb2da386f 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.3 1998/07/25 16:57:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.4 1999/01/14 13:05:11 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h index 5afef810c2..e63619e3a6 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.h +++ b/hw/xfree86/os-support/shared/xf86Axp.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */ #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 c8e2cfa499..33cecdc4de 100644 --- a/hw/xfree86/os-support/solaris/apSolaris.shar +++ b/hw/xfree86/os-support/solaris/apSolaris.shar @@ -1,5 +1,5 @@ #!/bin/sh -# $XFree86$ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/apSolaris.shar,v 1.3 2002/10/04 19:45:33 tsi Exp $ # 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 dc984bd4b7..bef97c802f 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.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.4 2004/03/08 15:37:12 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat @@ -45,49 +45,31 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { int fd; unsigned char *ptr; - char solx86_vtname[20]; int psize; int mlen; - /* - * Solaris 2.1 x86 SVR4 (10/27/93) - * The server must treat the virtual terminal device file - * as the standard SVR4 /dev/pmem. By default, then used VT - * is considered the "default" file to open. - * - * Solaris 2.8 x86 (7/26/99) - DWH - * - * Use /dev/xsvc for everything. - */ psize = xf86getpagesize(); Offset += Base & (psize - 1); Base &= ~(psize - 1); mlen = (Offset + Len + psize - 1) & ~(psize - 1); -#if defined(i386) && !defined(__SOL8__) - if (Base >= 0xA0000 && Base + mlen < 0xFFFFF && xf86Info.vtno >= 0) - sprintf(solx86_vtname, "/dev/vt%02d", xf86Info.vtno); - else -#endif - { - if (!xf86LinearVidMem()) - FatalError("xf86ReadBIOS: Could not mmap BIOS" - " [a=%lx]\n", Base); - sprintf(solx86_vtname, apertureDevName); - } - if ((fd = open(solx86_vtname, O_RDONLY)) < 0) + if (!xf86LinearVidMem()) + FatalError("xf86ReadBIOS: Could not mmap BIOS [a=%lx]\n", Base); + + if ((fd = open(apertureDevName, O_RDONLY)) < 0) { xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n", - solx86_vtname, strerror(errno)); + apertureDevName, strerror(errno)); return(-1); } + ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ, MAP_SHARED, fd, (off_t)Base); if (ptr == MAP_FAILED) { xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed " "[0x%08lx, 0x%04x]\n", - solx86_vtname, Base, mlen); + apertureDevName, Base, mlen); close(fd); return -1; } diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index fe8205e132..b08529a007 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.5 2001/11/25 13:51:24 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.6 2002/06/06 13:49:34 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/solaris/sun_inout.s b/hw/xfree86/os-support/solaris/sun_inout.s index 5c0b23ef6e..e8f03d0e8f 100644 --- a/hw/xfree86/os-support/solaris/sun_inout.s +++ b/hw/xfree86/os-support/solaris/sun_inout.s @@ -1,4 +1,4 @@ -/ $XFree86$ +/ $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_inout.s,v 1.1 2001/05/28 02:42:31 tsi Exp $ / / 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 9f3a235e51..27996d3123 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.2 2002/10/11 01:40:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 0213a07326..058f1109a2 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.1 2001/05/28 02:42:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.2 2003/10/09 11:44:00 pascal Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index 30cf288cac..f6481af297 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.5 2003/08/26 19:00:36 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.6 2003/10/09 11:44:00 pascal Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 02883f054a..bedc8a62b9 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.2 2001/10/28 03:34:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.4 2004/03/08 15:37:12 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat @@ -75,50 +75,15 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) { pointer base; int fd; - char vtname[20]; - /* - * Solaris 2.1 x86 SVR4 (10/27/93) - * The server must treat the virtual terminal device file as the - * standard SVR4 /dev/pmem. - * - * Using the /dev/vtXX device as /dev/pmem only works for the - * A0000-FFFFF region - If we wish you mmap the linear aperture - * it requires a device driver. - * - * So what we'll do is use /dev/vtXX for the A0000-FFFFF stuff, and - * try to use the /dev/fbs/aperture or /dev/xsvc driver if the server - * tries to mmap anything > FFFFF. Its very very unlikely that the - * server will try to mmap anything below FFFFF that can't be handled - * by /dev/vtXX. - * - * DWH - 2/23/94 - * DWH - 1/31/99 (Gee has it really been 5 years?) - * - * Solaris 2.8 7/26/99 - * Use /dev/xsvc for everything - * - * DWH - 7/26/99 - Solaris8/dev/xsvc changes - * - * TSI - 2001.09 - SPARC changes - */ + if (!xf86LinearVidMem()) + FatalError("xf86MapVidMem: no aperture device\n"); -#if defined(i386) && !defined(__SOL8__) - if(Base < 0xFFFFF) - sprintf(vtname, "/dev/vt%02d", xf86Info.vtno); - else -#endif - { - if (!xf86LinearVidMem()) - FatalError("xf86MapVidMem: no aperture device\n"); - - strcpy(vtname, apertureDevName); - } - - fd = open(vtname, (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR); + fd = open(apertureDevName, + (Flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR); if (fd < 0) FatalError("xf86MapVidMem: failed to open %s (%s)\n", - vtname, strerror(errno)); + apertureDevName, strerror(errno)); base = mmap(NULL, Size, (Flags & VIDMEM_READONLY) ? diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index d8dea0f16e..1e9166712a 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.4.4.3 1998/07/18 17:53:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.5 1998/07/25 16:57:08 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index c110f452e6..d48efd76e0 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.10 2002/10/11 01:40:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.11 2003/02/17 15:12:00 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index 2f7e4e7237..c0460f5242 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.20tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.21 2003/03/14 13:46:08 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index b8d8a90868..0478ee65e6 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.19 2000/02/10 22:33:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.20 2001/03/06 18:20:31 dawes Exp $ */ /* * 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 45df282752..2085a3e70c 100644 --- a/hw/xfree86/os-support/sysv/xqueue.h +++ b/hw/xfree86/os-support/sysv/xqueue.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */ #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 344f7e9019..917b115268 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.6 2003/11/03 05:11:51 tsi Exp $ */ /* * 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 4df2d502aa..4d3205eb47 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.94 2003/11/03 05:11:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.95 2003/11/17 22:20:40 dawes Exp $ */ /* * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany * Copyright 1992 by David Dawes diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index b732702361..09d3f2861f 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.56 2003/08/24 17:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.57 2003/10/07 23:14:54 herrb Exp $ */ #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index 695c165050..fa22e220d3 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.13 2003/01/01 19:22:20 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/parser/DRI.c,v 1.14 2003/01/04 20:20:22 paulo Exp $ * */ diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index e2dbb3e919..3cd3749ede 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.6 2000/10/20 14:59:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 2b8cf7171b..d8d5332f9b 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.5 1999/06/12 17:30:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.7 2002/09/16 18:06:18 eich Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 783d79b935..c704bd75ec 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.2 1999/05/15 12:10:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.3 1999/06/12 07:19:05 dawes Exp $ */ #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c index fd436ef855..f0a960a661 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.3 1999/01/17 10:54:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.4 1999/01/26 05:54:14 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 440b0021bc..3b42ecb138 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.7 2000/10/20 12:57:27 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index c52b5a7456..ea1180285c 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.2 1998/07/25 16:57:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.3 1998/08/20 08:56:03 dawes Exp $ */ #include "xf86RamDac.h" diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index 67469d2ed3..bea623b78c 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.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.2 1998/07/25 16:57:18 dawes Exp $ */ #include "BT.h" diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES index 726e2edc14..3e901e3807 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.4tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/ramdac/CURSOR.NOTES,v 1.5 2003/02/13 20:28:41 tsi Exp $ diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 69207c2e27..34562e2970 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.12 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.13 2003/09/24 02:43:35 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index 00d039031b..5462966306 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.7 1999/02/12 22:52:11 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.8 2001/10/28 03:34:03 tsi Exp $ */ #include diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 1a2bf2065d..6fecb7705d 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.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ #include "IBM.h" diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index ce6dd9a04c..5e466b7071 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, . */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.8 2003/09/24 02:43:35 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index f87ebd13f4..9451f814c9 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.4 2000/05/02 21:04:46 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.5 2003/02/17 16:08:29 dawes Exp $ */ #include diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index 81fe844a18..d815527641 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 1998/07/25 16:57:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 2000/03/21 21:15:28 alanh Exp $ */ #include "TI.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index eedb003778..49379e9348 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.19tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.20 2003/02/24 20:43:54 tsi Exp $ */ #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ac88f4e5f5..5e5df46f32 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.11 2003/02/15 03:14:47 tsi Exp $ */ #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 603f8ecd00..5a6ab118a9 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.5 2003/02/15 03:14:47 tsi Exp $ */ #ifndef _XF86CURSORPRIV_H #define _XF86CURSORPRIV_H diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index ad9977d67d..41b623a6a5 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.12 2003/02/13 20:28:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.13 2003/03/04 21:21:15 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index 7821e591c8..b45be814d4 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.7 2003/11/03 05:11:53 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 319a7b5779..626a8b2b99 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.9 1999/03/28 15:33:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.11 2000/03/21 21:15:28 alanh Exp $ */ #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 14cda093d4..3b01081df0 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.6 2000/03/21 21:15:28 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.7 2000/07/26 01:52:24 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c index cb100d7bb5..7549496061 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.5 1999/01/17 10:54:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.6 1999/01/26 05:54:18 dawes Exp $ */ #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index 45680a05bb..f1eeb3a7d3 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.3 1998/12/06 06:08:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.4 1999/07/18 03:27:02 dawes Exp $ */ #include "xf86RamDac.h" #include "xf86cmap.h" diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids index fbc34d8c51..2f346978be 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.11 2003/12/18 16:22:27 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $ # # Vendors, devices and subsystems. Please keep sorted. diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index cf12c42cc1..534c8973f5 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.13 2003/08/24 17:37:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.14 2003/09/23 05:21:46 dawes Exp $ */ /* * 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 ad090d43cb..3bb14b0a9f 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.1 1999/01/31 12:38:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.2 1999/02/01 12:08:45 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index fe69c62100..093f35b303 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.20tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.21 2003/11/10 18:22:38 tsi Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index e428226007..d028980bda 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.3 2002/10/16 22:12:54 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.4 2003/02/18 19:10:35 alanh Exp $ */ #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index c5b3c613a6..b0d9de0589 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.2 2002/11/15 17:01:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.3 2002/12/21 02:35:20 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/gtf/gtf.man.pre index ea76684f3a..f2d2ae9ec2 100644 --- a/hw/xfree86/utils/gtf/gtf.man.pre +++ b/hw/xfree86/utils/gtf/gtf.man.pre @@ -1,4 +1,4 @@ -.\" $XFree86$ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1 2002/11/12 01:31:23 dawes Exp $ .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 bd42f637ff..b977936d33 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.4 2003/01/01 19:16:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.5 2004/01/05 16:42:10 tsi Exp $ */ /* * 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 3c3c535acf..f7d07eb79f 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.5 1996/12/23 06:47:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.6 1998/07/26 09:56:17 dawes Exp $ */ /* 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 3f7842cfdd..677663d7ee 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.4 1998/04/05 02:28:42 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.man,v 3.5 2001/01/27 18:20:56 dawes Exp $ .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 1b5c08563f..e70fb2db76 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: kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.c,v 3.12 2003/10/07 21:39:43 herrb Exp $ */ /* 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 367b4fc9ae..528ed12f00 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.6 2001/01/27 18:20:41 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/sun/kbd_mode.man,v 1.7 2001/12/14 19:59:42 dawes Exp $ .\" .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 3549d9740d..14cfa885f1 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.3 2001/01/27 18:20:56 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.man,v 3.4 2003/05/29 21:48:09 herrb Exp $ .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 5746269f57..670f2b4427 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -23,14 +23,14 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.93 2004/03/05 16:03:04 tsi Exp $ */ #include "X.h" #include "os.h" #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSproc.h" -#include "xf86Pci.h" +#include "Pci.h" #include "xf86PciInfo.h" #include "xf86ScanPci.h" #include "dummylib.h" @@ -148,7 +148,7 @@ usage(void) int main(int argc, char *argv[]) { - pciConfigPtr *pcrpp = NULL; + pciConfigPtr pPCI, *pcrpp = NULL; int Verbose = 0; int i = 0; int force = 0; @@ -159,7 +159,7 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, "?v12OfV:")) != -1) switch(c) { case 'v': - Verbose = 1; + Verbose++; break; case '1': xf86Info.pciFlags = PCIProbe1; @@ -204,8 +204,25 @@ main(int argc, char *argv[]) exit (1); } - while (pcrpp[i]) - identify_card(pcrpp[i++],Verbose); + while ((pPCI = pcrpp[i++])) + identify_card(pPCI, Verbose); + + if (Verbose > 1) { + printf("\nPCI bus linkages:\n\n"); + + for (i = 0; i < MAX_PCI_BUSES; i++) { + pciBusInfo_t *pBusInfo; + + if (!(pBusInfo = pciBusInfo[i])) + continue; + + if ((pPCI = pBusInfo->bridge)) + printf("PCI bus 0x%04x has parent bridge 0x%04x:0x%02x:0x%1x\n", + i, pPCI->busnum, pPCI->devnum, pPCI->funcnum); + else + printf("PCI bus 0x%04x has no parent\n", i); + } + } xf86DisableIO(); exit(0); diff --git a/hw/xfree86/utils/scanpci/scanpci.man.pre b/hw/xfree86/utils/scanpci/scanpci.man.pre index 2c9bcc964b..baf2316039 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.2 2000/12/11 20:18:45 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.man,v 3.3 2001/01/27 18:20:56 dawes Exp $ .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 b830f7529f..75fe91b95b 100644 --- a/hw/xfree86/utils/xorgcfg/TODO +++ b/hw/xfree86/utils/xorgcfg/TODO @@ -1,4 +1,4 @@ -$XFree86$ +$XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/TODO,v 1.1 2001/07/04 16:09:14 paulo Exp $ 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 53163e0707..40727ff625 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.8 2001/01/26 21:17:40 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.10 2002/12/05 19:31:18 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c index 7db0e2f850..5299025f1d 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.11tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h index 156da456fb..14411440de 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.h,v 1.1 2000/04/04 22:36:57 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card.xbm b/hw/xfree86/utils/xorgcfg/card.xbm index 231adcaaec..b3cbba3228 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xbm,v 1.1 2000/04/04 22:36:57 dawes Exp $ */ #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 32bccb689e..d682574699 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card.xpm,v 1.1 2000/04/04 22:36:57 dawes Exp $ */ 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 b63fb3393b..d5805fa98a 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.14 2002/09/12 15:19:07 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.15 2003/02/15 05:37:58 paulo Exp $ */ #define CARDS_PRIVATE diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h index a6637a664c..0e5ee328fd 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.2 2001/07/06 02:04:10 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.3 2002/07/15 20:46:04 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/computer.xpm b/hw/xfree86/utils/xorgcfg/computer.xpm index 9167e3eafc..75fc85b26b 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/computer.xpm,v 1.1 2000/04/04 22:36:58 dawes Exp $ */ 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 e241b2e14c..8c2da3d9b8 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.8tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.9 2003/11/03 05:11:58 tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index 990f7d01d9..aa38d520fe 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.22 2004/02/14 17:53:49 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c index bd01825857..a3dfcbe2d7 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.14tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c index 92283cd22c..2ae68a082c 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.7tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h index ba97da009d..f03e01b147 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.h,v 1.1 2000/06/13 23:15:51 dawes Exp $ */ /* help string definitions */ diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index 053b822571..68a1873ed6 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.36 2002/10/19 20:04:21 herrb Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.37 2002/10/21 04:18:36 paulo Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 3482653b82..87989fdc26 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.21 2002/12/05 20:24:21 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.22 2003/01/01 19:22:24 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h index 9de55e65e2..6ff63c0023 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.3 2001/03/02 22:39:27 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard.xbm b/hw/xfree86/utils/xorgcfg/keyboard.xbm index 5114bee3ef..69d4aac42d 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xbm,v 1.1 2000/04/04 22:36:59 dawes Exp $ */ #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 200ba7f428..5ef7b605da 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard.xpm,v 1.1 2000/04/04 22:36:59 dawes Exp $ */ 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 9e46f39931..fb3d3f5fcb 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index 3ba5b937a6..1a47020209 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.6 2001/07/07 01:43:58 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.8 2004/03/05 16:04:59 tsi Exp $ */ #ifdef USE_MODULES @@ -75,7 +75,7 @@ typedef union { unsigned long num; char * str; double realnum; - Bool bool; + Bool flag; OptFrequency freq; } ValueUnion; diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c index 83d1d0586f..e3f4e9f478 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.16 2003/03/12 16:40:28 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c index 04def80e25..6ed0954168 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.6 2001/02/21 23:37:03 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.8 2003/09/11 10:08:38 eich Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h index b7b16e15bc..03ca18a414 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.3 2000/11/30 20:55:18 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor.xbm b/hw/xfree86/utils/xorgcfg/monitor.xbm index 972388a92f..c4b01eb742 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xbm,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ #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 e647e3cc10..c694edf2e5 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor.xpm,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ 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 779f211307..17a1c0caff 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.11tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.12 2003/11/03 05:11:58 tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h index 6c67d9d5e9..249f508406 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse.xbm b/hw/xfree86/utils/xorgcfg/mouse.xbm index 3f6bce72ff..8577137e63 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xbm,v 1.1 2000/04/04 22:37:01 dawes Exp $ */ #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 ea157c2665..7ad21fb8f5 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 * - * $XFree86$ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse.xpm,v 1.1 2000/04/04 22:37:01 dawes Exp $ */ 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 8aa9a09a8d..10828a94a7 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.11 2001/10/28 03:34:08 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.12 2001/11/03 20:32:31 paulo Exp $ */ #include "options.h" diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h index 4194593d1e..a900726072 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.6 2001/06/01 18:43:50 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.7 2001/07/06 02:04:10 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c index 26e675a8fc..9390afc6d3 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.14 2003/11/03 05:11:58 tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h index c7174b626a..a152f61881 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.2 2000/05/18 16:29:59 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c index 80f4235af3..25fd5f2902 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.8 2001/10/28 03:34:08 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.9 2002/06/06 21:03:32 paulo Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h index 624d87b968..7c3e2c75fe 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.3 2000/12/01 18:31:07 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c index 038f21d38f..23b0ecf5a9 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.7 2002/01/07 20:38:29 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.8 2002/10/19 20:04:21 herrb Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c index 7028510773..6496bc868c 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.3 2002/11/09 11:12:53 herrb Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.4 2003/03/25 04:18:25 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h index e9cfbe2e0a..d554ac17a2 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.2 2000/10/23 21:16:52 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.3 2001/08/01 00:44:57 tsi Exp $ */ #ifndef _xf86cfg_stubs_h diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 3a257d0474..2011d1abd6 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.25 2003/11/12 00:10:30 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.26 2003/11/14 02:40:22 dawes Exp $ */ #include diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c index 595abf419c..3a51310d96 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.7tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ */ /* diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h index 8cdc4dc928..e445517cdb 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.3 2001/07/07 23:00:43 paulo Exp $ */ #ifndef _xf86cfg_vidmode_h diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c index e36915888f..cb4054a5eb 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.6 2003/11/03 05:11:59 tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h index 1095246b7a..575c3c9d01 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 * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.4 2000/11/30 20:55:18 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgconfig/Cards b/hw/xfree86/utils/xorgconfig/Cards index 857135de4b..83d8840ea7 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.79 2002/10/16 01:31:05 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $ # VGA diff --git a/hw/xfree86/utils/xorgconfig/Cards98 b/hw/xfree86/utils/xorgconfig/Cards98 index ef14a0345c..cfd96dc164 100644 --- a/hw/xfree86/utils/xorgconfig/Cards98 +++ b/hw/xfree86/utils/xorgconfig/Cards98 @@ -1,4 +1,4 @@ -# $XFree86: xc/programs/Xserver/hw/xfree98/xf86config/Cards98,v 1.7 1998/06/04 16:43:45 hohndel Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.1 1999/07/11 10:50:41 dawes Exp $ # # # diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index d5f405f4a1..8aac066064 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.16 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */ /* * Functions to manipulate card database. diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index 1d98924911..c5299e8991 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.4 1999/03/28 15:33:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */ diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 9cc8be74d1..07659d9434 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.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.3 2003/11/03 05:11:53 tsi Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 2f49ffd9b2..3a1b487495 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.4 2004/01/07 04:28:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.5 2004/02/02 03:55:32 dawes Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index b3951f8f9a..ae16d7b758 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -27,7 +27,7 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.4 2003/11/06 18:38:14 tsi Exp $ */ #include "xf86.h" diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index c37cbd8bf1..b3c57b917e 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -26,7 +26,7 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $ */ #ifndef _VBE_MODES_H diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c index 0347f7fb71..65b161a2c6 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/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */ #include "xf86.h" #include "xf86str.h" diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index 28f8b6fc7d..a70f572b57 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.5 1998/11/22 10:37:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/x86emu/debug.c b/hw/xfree86/x86emu/debug.c index 481374d532..7519b35c31 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.2 2000/04/05 18:13:14 dawes Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/debug.c,v 1.4 2000/04/17 16:29:45 eich Exp $ */ #include "x86emu/x86emui.h" #ifdef IN_MODULE diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c index 96185c50fc..b9eb1ad797 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.11 2002/07/23 20:20:43 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/fpu.c b/hw/xfree86/x86emu/fpu.c index 4b801dc94c..0f679bde62 100644 --- a/hw/xfree86/x86emu/fpu.c +++ b/hw/xfree86/x86emu/fpu.c @@ -36,7 +36,7 @@ * emulation of the FPU instructions. * ****************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/fpu.c,v 1.2 2003/10/22 20:03:06 tsi Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c index 88ee7e1084..94041f6c8c 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.8tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/ops.c,v 1.9 2003/10/22 20:03:06 tsi Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c index 7cb585bc89..47c49ad52f 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.6tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/ops2.c,v 1.7 2004/02/06 17:15:28 tsi Exp $ */ #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/sys.c b/hw/xfree86/x86emu/sys.c index 39941360de..d493ae8379 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.6 2002/09/16 18:05:18 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.7 2002/12/24 17:42:58 tsi Exp $ */ #include "x86emu.h" #include "x86emu/x86emui.h" diff --git a/hw/xfree86/x86emu/x86emu.h b/hw/xfree86/x86emu/x86emu.h index 1df9ac50df..de989b83f5 100644 --- a/hw/xfree86/x86emu/x86emu.h +++ b/hw/xfree86/x86emu/x86emu.h @@ -37,7 +37,7 @@ * include this header * ****************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/extras/x86emu/include/x86emu.h,v 1.3 2002/09/16 18:05:17 eich Exp $ */ #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 8abedf6160..56221cbbaf 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.3 2000/04/19 15:48:15 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.4 2000/11/21 23:10:27 tsi Exp $ */ #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 bb2bc0bee8..d134f42949 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$ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/decode.h,v 1.3 2002/07/23 01:51:03 tsi Exp $ */ #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 a125075b77..b975b87e07 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.2 2003/10/22 20:03:05 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/fpu_regs.h,v 1.3 2003/10/28 16:01:40 tsi Exp $ */ #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 041255f186..4fa8d55034 100644 --- a/hw/xfree86/x86emu/x86emu/prim_asm.h +++ b/hw/xfree86/x86emu/x86emu/prim_asm.h @@ -39,7 +39,7 @@ * platform. * ****************************************************************************/ -/* $XFree86$ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/prim_asm.h,v 1.3 2000/04/19 15:48:15 tsi Exp $ */ #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 fba2991d48..3a45801385 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.5 2003/10/22 20:03:05 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/regs.h,v 1.6 2003/10/28 16:01:40 tsi Exp $ */ #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 f31d77fe63..3a0dc17fc0 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.6 2003/06/12 14:12:26 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.7 2003/07/07 15:34:21 eich Exp $ */ #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 3adf61ec69..9cdb0a1b3b 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.3 2000/04/17 16:29:47 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/x86emui.h,v 1.4 2001/04/01 13:59:58 tsi Exp $ */ #ifndef __X86EMU_X86EMUI_H #define __X86EMU_X86EMUI_H diff --git a/hw/xfree86/xaa/XAA.HOWTO b/hw/xfree86/xaa/XAA.HOWTO index cbd71c1386..95d9d61009 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.12 2000/04/12 14:44:42 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/xaa/XAA.HOWTO,v 1.13 2001/05/22 18:51:09 mvojkovi Exp $ diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index 98db3cf501..f183f8f023 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.38 2002/10/21 01:54:04 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.39 2002/10/30 12:52:43 alanh Exp $ */ #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 5bde21cbe3..83850767a7 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */ /* 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 ce19a853e2..d7f3ba2a38 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.7 2001/05/18 20:22:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */ #include "Xmd.h" CARD32 XAAReverseBitOrder(CARD32 v); diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 272b9fb42f..9a8749dbfb 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.9 2000/06/29 10:55:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.10 2000/09/01 05:49:45 mvojkovi Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 7a036937bf..497c3e7a17 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.12 2000/09/28 20:47:59 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index 9e17a187fe..d3d1c8a5c2 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.13tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */ /* A CopyPlane function that handles bitmap->screen copies and diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index e4439c447b..b77be1ad6b 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index e5eba78196..212116ae43 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.4 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 6bc7bfed3c..01b4bb4083 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.4 1999/03/14 11:18:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 95ecf257b9..352d8e0841 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.3 1998/10/25 07:12:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */ /* * Filled solid arcs, based on cfbfillarc.c. diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 4ba1cd8537..5566f51e6b 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.15 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */ /* * Copyright 1996 The XFree86 Project diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index 7571ce3ca9..cda56e327f 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.15tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index b7a177521f..c9ef93a1be 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.18 2000/09/28 20:48:00 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 3eab6d46a1..ab6cb9a243 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.14 2000/05/03 00:44:23 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index b7ee997e3b..c3db7ff57a 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.20tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 186711e3f6..5237e8b2c1 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.34 2001/07/19 14:19:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 7233e215cb..1b1bc18303 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.35tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 3149acf5c4..2084e8d616 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.5 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 8afd479b73..3709210024 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.4 1998/09/27 04:43:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 514a8cf428..234d242c49 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.4 1998/09/13 05:23:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.6 1999/11/06 23:14:46 mvojkovi Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 914631b58d..e1c57588a5 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.12 2000/04/07 19:11:10 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index b50b31bb01..0fb1db365c 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.5 1999/07/04 06:39:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */ /* Copyright (c) 1999 - The XFree86 Project Inc. diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 279179356b..d527b7c15d 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.14tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.15 2003/11/10 18:22:41 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index eb20ea8ddc..5cce3e7ed9 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.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */ #include "misc.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 25f8bd4867..c7756ba93d 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.32tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index eb50cc9d0e..2adf424669 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.10 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index af33802315..ce72d742c0 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.18 2003/04/23 18:35:34 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $ * * 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 70a7b1d7d0..4075bab6af 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */ #include "X.h" #include "misc.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 999d7177d4..fe8d70de2e 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.2 1998/07/25 16:58:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 356774c290..5222256650 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.14 2000/03/28 01:21:05 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 56cd9e3c40..b27a54e81d 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.1 2000/06/20 05:08:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */ #include "misc.h" #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 8b111d1cf2..862f50ba03 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.11 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.12 2003/08/04 22:18:31 mvojkovi Exp $ */ #include "xaa.h" #include "xaalocal.h" diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 0fd5726171..845dccd4ea 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.7 1999/11/06 23:14:46 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.9 2000/09/01 05:49:45 mvojkovi Exp $ */ #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaTEGlyphBlt.S b/hw/xfree86/xaa/xaaTEGlyphBlt.S index 5f3137f45f..f5c580760f 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.1 1999/07/10 07:24:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyphBlt.S,v 1.2 1999/12/27 00:39:52 robin Exp $ */ /* diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 49089afb3b..82fa286744 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.6 1998/12/20 11:57:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index 6c16f11d35..0d2ce760ad 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.1.2.1 1998/07/12 09:43:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.2 1998/07/25 16:58:53 dawes Exp $ */ /* * 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 fedd8f44d7..f999b425f3 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.10 2001/11/16 16:47:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */ /* diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 933d8f7333..276f016722 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.3 2000/01/21 02:30:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */ #include "Xarch.h" diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 04d8d154a8..4504deffd7 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.36tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.37 2003/11/10 18:22:41 tsi Exp $ */ #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index 048ed00fca..8fee075339 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaarop.h,v 1.1 1999/03/21 07:35:31 dawes Exp $ */ /* diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index 59f0a2cc7e..e6963c3254 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.3 1998/10/25 07:12:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.5 2000/09/20 02:05:42 keithp Exp $ */ #define XAA_SCREEN_PROLOGUE(pScreen, field)\ ((pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index a293324973..e72fa43169 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.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.2 1998/07/25 16:59:24 dawes Exp $ */ #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbmap.sh b/hw/xfree86/xf1bpp/mfbmap.sh index 5140407762..a8f43eceb5 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.1.2.3 1998/06/27 14:48:23 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.sh,v 1.2 1998/07/25 16:59:24 dawes Exp $ # # 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 0134872e09..94c0298560 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.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */ #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.sh b/hw/xfree86/xf1bpp/mfbunmap.sh index 44dc781fc3..6b244e68e5 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.1.2.1 1998/06/27 14:48:24 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.sh,v 1.2 1998/07/25 16:59:25 dawes Exp $ # # 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 e3b77dcfdd..f9ccc95c11 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.1.2.2 1998/06/27 15:15:45 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/NOTES,v 1.2 1998/07/25 16:59:26 dawes Exp $ diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 9b5ea57ead..3891f1e21a 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.3 1999/01/31 12:22:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.4 2000/07/26 01:52:26 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index 4a347b5d11..e9ac98dc90 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.2 1998/07/25 16:59:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index a7f1156825..42f118aac4 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.2 1998/07/25 16:59:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index 1e2d095eef..650c448b80 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h index 15231a653b..f99ce33e0f 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.1.2.1 1998/06/27 14:48:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index 82b17e59e1..3002560211 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.2 1998/07/25 16:59:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ /* 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 29b816a3ab..5609959577 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.3 1999/06/06 08:48:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index 5d677174de..4c4d8eab63 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index c53edd19d6..3d6c3df52d 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.2 1998/07/25 16:59:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ /* 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 b4f5bd0142..a5d5b5b37e 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.8 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */ /* 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 b200a611e8..c2717599f8 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.5 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 106fc6ae54..7ca32d903a 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ /************************************************************ diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index e684bf118c..1d118863fb 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.4 1999/10/13 20:04:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */ /* * Copyright 1993 Gerrit Jan Akkerman * diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 0d1a2075b3..40e9d5b327 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index 295f521590..a1f49a486d 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.2 1998/07/25 16:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.3 1999/06/06 08:48:57 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index aef3c2dd57..a68f5faff2 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.2 1998/07/25 16:59:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index 87b3871765..cd307fe942 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.4 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.5 1999/09/25 14:38:16 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index c6df4ef410..86b7d6f6c4 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.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 5c3aff6f63..919fa0133b 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.2 1998/07/25 16:59:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index ec9032e574..af1ecb95e8 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ /* 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 bbc64c97cb..df8ae335f2 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.8 2003/02/18 21:29:59 tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 78273ca236..341e17534a 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.3 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index 00cd985a7d..b6c404e80d 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.2 1998/07/25 16:59:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.3 1999/06/06 08:48:59 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 02019b19ac..f6999c561e 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ /* Copyright (c) 1990 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 948359a308..275db433aa 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index 66b547e594..c009d696ee 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index c3085bc4b2..2317fbdfa6 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.3 1999/01/14 13:05:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index 65ff055d2f..f52343fc91 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.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index 736d128c69..d080a623ff 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.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 8bb43eea44..754eb37327 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.2 1998/07/25 16:59:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 267eef0efb..57d5fcff85 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.2 1998/07/25 16:59:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index 47e4277553..5d33bc3c9c 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.4 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.5 2001/12/17 20:00:46 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 9c3464de1d..81294b2cc2 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.2 1998/07/25 16:59:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h index bc56ca1fc9..7ea244f66c 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.1.2.1 1998/06/27 14:48:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.2 1998/07/25 16:59:42 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index ff59fccffb..fc38cdcfee 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index a1c7afd9d2..1de8d68ee7 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.3 1999/06/06 08:49:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index dc7b7965a8..660cc356b7 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.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ /* GJA -- span move routines */ diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index 39597d268a..867e2c50ea 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index a03f21d2b2..4357e4d8a0 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index a3596e6a31..43f59d9389 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.3 1999/06/06 08:49:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index 6cd15e9f59..b3711f8525 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index 316b4a49b2..f5ace74d03 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.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index 345492c593..ecc2fa738d 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.1.2.1 1998/06/27 14:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.2 1998/07/25 16:59:45 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index f3acf8123a..3509ce77f5 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.3 1999/06/06 08:49:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.4 2002/01/25 21:56:23 tsi Exp $ */ diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 1c7261eb9a..5fd303d7db 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.2 1998/07/25 16:59:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.3 2000/09/26 15:57:21 tsi Exp $ */ diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 976f27e32d..59458a2589 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.9 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */ #ifndef __XF4BPP_H__ diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index a4a3bda222..b7fa9fd002 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.1 1999/01/31 12:22:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.2 1999/03/28 15:33:09 dawes Exp $ */ #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 b2b126d956..d0d1974e76 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16module.c +++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index cb4b8d7261..5e19fb7a20 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.7 2000/01/21 01:12:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.8 2003/02/17 16:08:30 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c index 277abafc8d..757b0dc49a 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */ #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 98a50f810b..30bc1a0faf 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.5 2000/03/02 02:32:52 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ #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 2c8f203f8b..9ed6b20186 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.5 1999/01/24 13:32:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.6 1999/01/26 05:54:20 dawes Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 3ebddd2d26..581efb4f6c 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.2 1999/01/31 12:22:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ #define PSZ 8 #include "cfb.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 2bfda9f6f2..53af8f7d85 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.5 2000/02/29 00:17:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index b08288f19e..248ca0869c 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.1 1999/01/03 03:58:55 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index f55aeb86c8..6c13ca721a 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.3 2000/02/11 06:33:46 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.4 2001/12/14 19:59:52 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index 635861bb56..d8a6f4608a 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.3 2000/02/29 00:17:16 mvojkovi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index 19f9055e3e..d01b2b5cb9 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.5 2001/12/14 19:59:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 0510ae3c5e..e737e025e2 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.2 2000/02/25 00:21:40 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index de7dcc8502..516decd6cf 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.1 1999/01/03 03:58:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 93323d4875..7f123d36aa 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.11 2001/04/14 21:17:49 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index 3576a41c34..c18b543991 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.8tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */ #include "X.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 2268352496..998503c21f 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.8 2000/03/25 20:14:43 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.9 2002/02/11 00:07:25 dawes Exp $ */ /* 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 2168054d92..9913c2a6c8 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32wid.h +++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32wid.h,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ #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 83b6118bb3..5a47b9ff55 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c +++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ #ifdef XFree86LOADER diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index 8f307034f5..93c15371d3 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -7,7 +7,7 @@ Mark Vojkovich's work. */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index b16266e934..0aa8941763 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c index b11f05f1dd..b7ac739b3a 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.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.3 2003/11/10 18:22:43 tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 0da0d50069..488179d018 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h index a0c586bcb2..dc2ac9de0e 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTARGC_H #define XNESTARGS_H diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index bcebc10cdd..ae5ded5e32 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h index 9ce72a946e..0b3c225811 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTCOLOR_H #define XNESTCOLOR_H diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index 146e7ebd0a..52ba867cf6 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.3 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index 301ab139aa..1a87030639 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.4 2001/10/28 03:34:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.5 2003/11/16 05:05:20 dawes Exp $ */ #include diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h index 78df26969e..044f8f1316 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.6 2001/01/17 22:36:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.7 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h index 7b96bdfee3..6f52b286b1 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifndef XNESTDRAWABLE_H #define XNESTDRAWABLE_H diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index a36e0d8e81..1b7b3935f0 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.2 2001/08/01 00:44:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #define NEED_EVENTS diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h index 9ed211cb8c..ed0fbb8304 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTEVENTS_H #define XNESTEVENTS_H diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index a0256c313a..f708488549 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.6 2003/07/16 01:38:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xatom.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index 7141e9cb9b..972849d9aa 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.6 2001/10/28 03:34:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 042a29f6ed..b43695c968 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.5 2003/07/16 01:38:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h index ccdc40ebe1..722dde470d 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTGCOPS_H #define XNESTGCOPS_H diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c index 1ffc547646..3db9b85963 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #include "Xos.h" diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 5344e4e506..693c7296b0 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.2 2001/08/01 00:44:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h index 9a1e809cc8..ae92352d12 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTHANDLERS_H #define XNESTHANDLERS_H diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 7a43b62b4b..6b3c4f19f1 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.24 2003/01/15 02:34:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.25 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index bda0780233..eb92918783 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.9 2003/09/13 21:33:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index 4802318605..5f8dc3cb40 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTKEYBOARD_H #define XNESTKEYBOARD_H diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 5a92dc2717..b82dfa49be 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.7 2003/07/16 01:38:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 853a48955f..1af5f02ec4 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h index 27a2011b8c..0b06e50214 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTPOINTER_H #define XNESTPOINTER_H diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 3412edfb86..6868845550 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.12 2003/11/14 22:25:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.13 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h index f35a2872d7..96260435b0 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTSCREEN_H #define XNESTSCREEN_H diff --git a/hw/xnest/TestExt.c b/hw/xnest/TestExt.c index d7006207ae..f153b5b2c9 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.5 2001/08/27 17:41:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ #include #include diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index f88e587b9d..bcf7881eb5 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h index dfa74dbdce..14e0085dcb 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTVISUAL_H #define XNESTVISUAL_H diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index f7e04844e2..14ddac0821 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.7 2001/10/28 03:34:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h index b396c80b53..7d9426d72e 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.2 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTCURSOR_H #define XNESTCURSOR_H diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 7fb4017bd4..34d236f3b9 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTFONT_H diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index 56939cceb7..bbec67120d 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTGC_H #define XNESTGC_H diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index fab1843d1f..4e4d9c40c0 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.3 2003/01/10 13:29:40 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h index cc49b23434..8b5f39115d 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.3 2003/11/03 05:36:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ #ifndef XNESTWINDOW_H #define XNESTWINDOW_H diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index ade73833f4..64b09de7e9 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$ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.3 2001/08/28 16:48:08 tsi Exp $ */ /* ** 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 131c224f2d..4884891895 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.6 2001/01/27 18:21:00 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.7 2003/10/24 17:22:33 dawes Exp $ .\" .TH XNEST 1 __xorgversion__ .SH NAME diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c index 2e3b7b3997..15282d206f 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.1 2002/05/31 18:46:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.2 2003/11/06 03:25:46 dawes Exp $ */ /* 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 92fb5c3e56..de84a7aeee 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.11 2002/07/05 09:19:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.13 2003/07/29 21:25:15 dawes Exp $ */ #include "win.h" #include "../../Xext/xf86miscproc.h" diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 13381ffa1d..3202ae8d94 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.34 2003/10/02 13:30:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.35 2003/10/08 11:13:02 eich Exp $ */ #include "win.h" #include "winconfig.h" diff --git a/hw/xwin/XWin.man b/hw/xwin/XWin.man index 8a185f1cab..fe78047c46 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.5 2002/07/05 09:19:25 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xwin/XWin.man,v 1.7 2003/10/02 13:30:09 eich Exp $ .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 c918304afc..7b5708af23 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.1 2002/10/17 08:18:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/XWin.rc,v 1.2 2003/07/29 21:25:15 dawes Exp $ */ #include "resource.h" diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index 2ca4f34627..b67a556b52 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/ddraw.h,v 1.4 2001/07/29 22:08:15 tsi Exp $ */ #ifndef __WINE_DDRAW_H #define __WINE_DDRAW_H diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 53d0880ea2..6ecf5ada06 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.37 2003/10/02 13:30:09 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.38 2003/10/08 11:13:02 eich Exp $ */ #ifndef _WIN_H_ #define _WIN_H_ diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index 0da1365415..a273095987 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.11 2002/10/17 08:18:21 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.12 2002/10/31 23:04:39 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c index 35463493ba..cc057eed69 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.5 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winblock.c,v 1.7 2003/07/29 21:25:16 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winclip.c b/hw/xwin/winclip.c index b8d10365d6..a829e8eb9b 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.1 2001/04/05 20:13:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winclipboard.h b/hw/xwin/winclipboard.h index 3e7c22fa06..8f9bae7891 100644 --- a/hw/xwin/winclipboard.h +++ b/hw/xwin/winclipboard.h @@ -27,7 +27,7 @@ * * Authors: Harold Hunt */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #ifndef _WINCLIPBOARD_H_ diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c index 0a19777595..a1f7b0b6d9 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/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardinit.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardtextconv.c b/hw/xwin/winclipboardtextconv.c index 2f11b9241e..09ef400764 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/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardtextconv.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ #include "win.h" #include diff --git a/hw/xwin/winclipboardthread.c b/hw/xwin/winclipboardthread.c index 7a746a0b3d..06a9855334 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/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardthread.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardunicode.c b/hw/xwin/winclipboardunicode.c index bda09b79f7..9eb2b0d87a 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/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardunicode.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c index f8e52a0ef7..c577d060e4 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/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v 1.2 2003/07/29 21:25:16 dawes Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c index d2cfb2e557..8b3a564894 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/winclip.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboardxevents.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #include "winclipboard.h" diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index f89c26cf09..4fb89a2fdd 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.9 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.10 2002/10/17 08:18:22 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index db69005fd0..b42b1d6bfd 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.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */ #include "win.h" #include "winconfig.h" diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h index 22db4abee0..d3099b373a 100644 --- a/hw/xwin/winconfig.h +++ b/hw/xwin/winconfig.h @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.h,v 1.1 2002/10/17 08:18:22 alanh Exp $ */ #ifndef __WIN_CONFIG_H__ #define __WIN_CONFIG_H__ diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index 10d2273cde..336131c8a7 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.4 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincreatewnd.c,v 1.7 2003/10/08 11:13:03 eich Exp $ */ #include "win.h" #include "shellapi.h" diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index 9e053a7d24..e7c3ba7e7b 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.5 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.6 2003/07/29 21:25:17 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c index 07db55075f..d905ad81c5 100755 --- a/hw/xwin/windialogs.c +++ b/hw/xwin/windialogs.c @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/windialogs.c,v 1.1 2003/07/29 21:25:17 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index c8c2ef40f7..d76e586288 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.3 2002/07/05 09:19:26 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winengine.c,v 1.5 2003/07/29 21:25:17 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index fa6687c1b9..8a1e0df85f 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.3 2001/10/23 22:22:47 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winerror.c,v 1.6 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index 556fde718a..9ac5362749 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.10 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c index a6ff2f7da0..97bd7967b8 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.2 2001/06/04 13:04:41 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winfont.c,v 1.3 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c index ce0ef65844..a4e2a53cb7 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.10 2001/10/30 15:39:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wingc.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" void diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c index 79dc5eb531..49ba7f2fb2 100644 --- a/hw/xwin/wingetsp.c +++ b/hw/xwin/wingetsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 4228ad4223..95f245e573 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.12 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.13 2003/07/29 21:25:17 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h index 9a4a3f68f0..0822b0e5fb 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.1 2001/09/26 13:00:34 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.3 2002/07/05 09:19:26 alanh Exp $ */ /* * We need symbols for the scan codes of keys. diff --git a/hw/xwin/winmisc.c b/hw/xwin/winmisc.c index e93d1fd934..ea8303ea9d 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.5 2001/11/11 22:45:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmisc.c,v 1.6 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index ef3a2eb92a..8c9439bfdf 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.3 2001/05/08 08:14:09 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.4 2001/10/29 21:10:24 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winms.h b/hw/xwin/winms.h index ad20348b6b..17454487db 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.1 2001/04/05 20:13:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winms.h,v 1.2 2001/04/18 17:14:06 dawes Exp $ */ #ifndef _WINMS_H_ #define _WINMS_H_ diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c index 8d42d95a0c..ce8ac41991 100644 --- a/hw/xwin/winmsg.c +++ b/hw/xwin/winmsg.c @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" #include "winmsg.h" diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h index 136cdc3a8f..16ec536b00 100644 --- a/hw/xwin/winmsg.h +++ b/hw/xwin/winmsg.h @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmsg.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */ #ifndef __WIN_MSG_H__ #define __WIN_MSG_H__ diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index be65bd153a..21be64977d 100755 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ #include #include "propertyst.h" diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h index f9cfee30f8..b6ad55d8bb 100755 --- a/hw/xwin/winmultiwindowclass.h +++ b/hw/xwin/winmultiwindowclass.h @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.h,v 1.2 2003/10/02 13:30:10 eich Exp $ */ /* diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 33b9391a87..dd56db6d66 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/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowicons.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c index a21bbe9f3e..2d6a6f2cc5 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.2 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.3 2003/12/22 01:34:20 dickey Exp $ */ #ifdef SHAPE diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index 1430b7d884..15e508659d 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/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwindow.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index f77a404769..a60d36135e 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -27,7 +27,7 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwm.c,v 1.3 2003/10/02 13:30:11 eich Exp $ */ /* X headers */ #include diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index 83f3b02f68..d90abb61f9 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.2 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.3 2003/10/08 11:13:03 eich Exp $ */ #include "win.h" #include "dixevents.h" diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index b2ac9f14e5..f7d8a4a1a8 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.14 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.15 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index 33cb42eb1c..7cbdb5e53f 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.17 2002/10/17 08:18:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.18 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index 24e49719a9..43ade059b9 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.10 2002/10/17 08:18:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.11 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpntwin.c b/hw/xwin/winpntwin.c index 46d7382091..d28929d67a 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.1 2001/04/05 20:13:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpntwin.c,v 1.2 2001/06/04 13:04:41 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winpolyline.c b/hw/xwin/winpolyline.c index baafd8c393..948c34428c 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.3 2001/09/13 08:25:45 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpolyline.c,v 1.4 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index b0a5d49eef..3bea60d3de 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.c,v 1.1 2003/10/02 13:30:11 eich Exp $ */ #include #include diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index 4ae01c0815..ae1cb07d84 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -27,7 +27,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winprefs.h,v 1.1 2003/10/02 13:30:11 eich Exp $ */ /* Need to know how long paths can be... */ #include diff --git a/hw/xwin/winprefslex.l b/hw/xwin/winprefslex.l index 9601834984..8eda8e6c26 100644 --- a/hw/xwin/winprefslex.l +++ b/hw/xwin/winprefslex.l @@ -28,7 +28,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winprefslex.l,v 1.1 2003/10/02 13:30:11 eich Exp $ */ #include #include diff --git a/hw/xwin/winprefsyacc.y b/hw/xwin/winprefsyacc.y index 5ae33b67e9..a6ffc72079 100644 --- a/hw/xwin/winprefsyacc.y +++ b/hw/xwin/winprefsyacc.y @@ -28,7 +28,7 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winprefsyacc.y,v 1.1 2003/10/02 13:30:11 eich Exp $ */ #include #include diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index 2ae0e65573..deb9629d72 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xwin/winregistry.c b/hw/xwin/winregistry.c index 7d4a473abf..b31fcf641f 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/winmisc.c,v 1.5 2001/11/11 22:45:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winregistry.c,v 1.1 2002/07/05 09:19:26 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c index 76a997aaa6..c5ec45de54 100644 --- a/hw/xwin/winrop.c +++ b/hw/xwin/winrop.c @@ -27,7 +27,7 @@ * * Authors: Alan Hourihane */ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winrop.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ /* * 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 595f3da7e9..79e985c6bc 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.27 2003/07/29 21:25:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.28 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c index 87a16fc31a..c0340e47b6 100644 --- a/hw/xwin/winsetsp.c +++ b/hw/xwin/winsetsp.c @@ -28,7 +28,7 @@ * Authors: Harold L Hunt II * Alan Hourihane */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.8 2003/08/07 23:47:58 alanh Exp $ */ #include "win.h" diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index 2c202a01c4..a409c27c64 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.22 2002/10/17 08:18:24 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.24 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index a5e09421e7..e902f31b09 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.23 2002/10/17 08:18:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */ #include "win.h" diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 29ce6761b7..16b1969d7a 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.21 2002/10/17 08:18:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winshadgdi.c,v 1.23 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index e7d611f812..90c77b1c83 100755 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -28,7 +28,7 @@ * Authors: Early Ehlinger * Harold L Hunt II */ -/* $XFree86: $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wintrayicon.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ #include "win.h" #include diff --git a/hw/xwin/winvideo.c b/hw/xwin/winvideo.c index e2eb7abfb7..8bf12cd66b 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.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ #include "win.h" #include "Xv.h" diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index 55658ecac4..f311d0dc9d 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.6 2002/10/17 08:18:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.7 2003/07/29 21:25:18 dawes Exp $ */ #include "win.h" diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index 378465bc45..76dfc5d897 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.9 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.10 2003/12/22 01:34:20 dickey Exp $ */ #include "win.h" diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index 963caafdf2..8153b56002 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.3 2003/10/02 13:30:11 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.4 2003/10/08 11:13:03 eich Exp $ */ #ifndef _WINWINDOW_H_ diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 535882753f..5b47a212a7 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.23 2002/10/17 08:18:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.26 2003/10/02 13:30:11 eich Exp $ */ #include "win.h" #include diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h index 7e015ebc42..cb4ee6be41 100644 --- a/ilbm/ilbm.h +++ b/ilbm/ilbm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.2 1998/04/05 16:42:23 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c index f861b93e9b..b148bc00c9 100644 --- a/ilbm/ilbmbitblt.c +++ b/ilbm/ilbmbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.2tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c index 286a824744..455c07cb56 100644 --- a/ilbm/ilbmblt.c +++ b/ilbm/ilbmblt.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */ /* * ilbm copy area */ diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c index 931da54fd2..4204c61b54 100644 --- a/ilbm/ilbmbres.c +++ b/ilbm/ilbmbres.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c index 1cd456bb1d..75391e96b7 100644 --- a/ilbm/ilbmbresd.c +++ b/ilbm/ilbmbresd.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c index 2a12a39bcc..8309e26003 100644 --- a/ilbm/ilbmbstore.c +++ b/ilbm/ilbmbstore.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */ /* $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 72d143e18d..4628e61d01 100644 --- a/ilbm/ilbmclip.c +++ b/ilbm/ilbmclip.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c index 06da361e26..10dadd9688 100644 --- a/ilbm/ilbmcmap.c +++ b/ilbm/ilbmcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.0 1996/08/18 01:53:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */ /* $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 28f2df91da..f107e4692c 100644 --- a/ilbm/ilbmfillarc.c +++ b/ilbm/ilbmfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.0 1996/08/18 01:53:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c index 4c2507487a..642a95f40e 100644 --- a/ilbm/ilbmfillrct.c +++ b/ilbm/ilbmfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.0 1996/08/18 01:53:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c index f7fe907438..5564e51424 100644 --- a/ilbm/ilbmfillsp.c +++ b/ilbm/ilbmfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.0 1996/08/18 01:53:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c index 05e89bd8d1..50cf56773e 100644 --- a/ilbm/ilbmfont.c +++ b/ilbm/ilbmfont.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c index 259935c46b..8253d9cd42 100644 --- a/ilbm/ilbmgc.c +++ b/ilbm/ilbmgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.0 1996/08/18 01:53:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c index e6adbae4a2..727bafd397 100644 --- a/ilbm/ilbmgetsp.c +++ b/ilbm/ilbmgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c index 277ac722a9..fe26381676 100644 --- a/ilbm/ilbmhrzvert.c +++ b/ilbm/ilbmhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c index 348d593a35..d2f7a4df9e 100644 --- a/ilbm/ilbmimage.c +++ b/ilbm/ilbmimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.0 1996/08/18 01:53:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ #include /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c index 24143fba32..1bd6f02f95 100644 --- a/ilbm/ilbmimggblt.c +++ b/ilbm/ilbmimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.0 1996/08/18 01:53:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c index 49dd7da467..d831489c5a 100644 --- a/ilbm/ilbmline.c +++ b/ilbm/ilbmline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.0 1996/08/18 01:53:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c index 9717aceca1..d85346acad 100644 --- a/ilbm/ilbmmisc.c +++ b/ilbm/ilbmmisc.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c index 01b9918922..ab5a33f2ab 100644 --- a/ilbm/ilbmpixmap.c +++ b/ilbm/ilbmpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c index 41d4545e4f..b76a29892c 100644 --- a/ilbm/ilbmply1rct.c +++ b/ilbm/ilbmply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.0 1996/08/18 01:54:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ /* * $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 fdd0a071fb..a7dca57563 100644 --- a/ilbm/ilbmplygblt.c +++ b/ilbm/ilbmplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.0 1996/08/18 01:54:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c index 497eb50ee9..0199b0bc6f 100644 --- a/ilbm/ilbmpntarea.c +++ b/ilbm/ilbmpntarea.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c index 787955a879..5cc29e331a 100644 --- a/ilbm/ilbmpntwin.c +++ b/ilbm/ilbmpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */ /* $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 e35b85416c..f313dc8d11 100644 --- a/ilbm/ilbmpolypnt.c +++ b/ilbm/ilbmpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.0 1996/08/18 01:54:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c index 5bedef8515..6a045d2426 100644 --- a/ilbm/ilbmpushpxl.c +++ b/ilbm/ilbmpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.0 1996/08/18 01:54:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c index f8b4eb52df..5a6fa71a0b 100644 --- a/ilbm/ilbmscrinit.c +++ b/ilbm/ilbmscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.4 1998/07/26 01:53:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c index 55073817d0..a18cf53f8e 100644 --- a/ilbm/ilbmsetsp.c +++ b/ilbm/ilbmsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.0 1996/08/18 01:54:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c index 2c39ef7a93..dc42baee9d 100644 --- a/ilbm/ilbmtegblt.c +++ b/ilbm/ilbmtegblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.0 1996/08/18 01:54:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ /* $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 d6e8154056..e289144ef8 100644 --- a/ilbm/ilbmtile.c +++ b/ilbm/ilbmtile.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c index fbf543de45..5249729440 100644 --- a/ilbm/ilbmwindow.c +++ b/ilbm/ilbmwindow.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */ /* $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 9ac30e267b..9bdf221550 100644 --- a/ilbm/ilbmzerarc.c +++ b/ilbm/ilbmzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.0 1996/08/18 01:54:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/include/XIstubs.h b/include/XIstubs.h index e005493c49..ad36bc7164 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.1 1996/04/15 11:34:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/XIstubs.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/bstore.h b/include/bstore.h index 098abcd866..c3a6a9f38c 100644 --- a/include/bstore.h +++ b/include/bstore.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.1 1998/04/05 16:44:25 robin Exp $*/ +/* $XFree86: xc/programs/Xserver/include/bstore.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/bstorestr.h b/include/bstorestr.h index 8f21855c4f..694841ed06 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.2 2001/01/06 20:58:12 tsi Exp $*/ +/* $XFree86: xc/programs/Xserver/include/bstorestr.h,v 1.3 2003/04/27 21:31:04 herrb Exp $*/ /* * Copyright (c) 1987 by the Regents of the University of California * diff --git a/include/closestr.h b/include/closestr.h index fcd64ed456..34d5931f29 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.4 2001/12/14 19:59:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */ #ifndef CLOSESTR_H diff --git a/include/colormap.h b/include/colormap.h index e8b2355295..f249f4f03e 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.5 2001/12/14 19:59:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ /* Copyright 1987, 1998 The Open Group diff --git a/include/cursor.h b/include/cursor.h index c29ccc31b9..7509a94afe 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/cursorstr.h b/include/cursorstr.h index 3984245adf..0e2f04a6de 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.8 2002/11/30 06:21:51 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */ #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H diff --git a/include/dix.h b/include/dix.h index 0ca157ad4f..a47bfd8cc7 100644 --- a/include/dix.h +++ b/include/dix.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.26 2003/01/12 02:44:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/dixevents.h b/include/dixevents.h index 46a5faef0f..f80f3ab0bf 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.4 2001/09/04 14:03:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixevents.h,v 3.5 2003/04/27 21:31:04 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/dixfont.h b/include/dixfont.h index d3bb69b0a1..2a6877de2d 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.7 2001/02/02 21:39:02 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */ #ifndef DIXFONT_H #define DIXFONT_H 1 diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 042e063db1..21992e7867 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.0 1996/04/15 11:34:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixgrabs.h,v 3.1 2003/04/27 21:31:04 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/dixstruct.h b/include/dixstruct.h index 9c39a8aec5..43920540f6 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.19tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/include/exevents.h b/include/exevents.h index 91c7acb6b8..ea3804bd33 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.1 1996/04/15 11:34:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/exevents.h,v 3.2 2003/04/27 21:31:04 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/extension.h b/include/extension.h index 34750173bb..6b674f07f6 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.5 2001/12/14 19:59:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ #ifndef EXTENSION_H #define EXTENSION_H diff --git a/include/extinit.h b/include/extinit.h index 37fa9a2454..107eee8910 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/extnsionst.h b/include/extnsionst.h index daf37bf43f..0d7debe0b5 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.8 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */ #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H diff --git a/include/gc.h b/include/gc.h index 2288e8491c..a886d77b88 100644 --- a/include/gc.h +++ b/include/gc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/gcstruct.h b/include/gcstruct.h index 6feff51f55..43cc679b47 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */ #ifndef GCSTRUCT_H #define GCSTRUCT_H diff --git a/include/globals.h b/include/globals.h index c193829752..3b1b6ba0b9 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.4 2000/06/28 18:21:22 tsi Exp $ */ #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index fa88febdac..acf3bca1a4 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.7 2001/12/14 19:59:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ #ifndef INPUT_H #define INPUT_H diff --git a/include/inputstr.h b/include/inputstr.h index 70627629ba..a8a8348071 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group diff --git a/include/misc.h b/include/misc.h index 5944a427fd..ffa65b31e1 100644 --- a/include/misc.h +++ b/include/misc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.28 2001/12/14 19:59:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.29 2003/04/27 21:31:04 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/miscstruct.h b/include/miscstruct.h index f0ff25b281..86f1147921 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.4 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */ #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 diff --git a/include/opaque.h b/include/opaque.h index 09a3570f94..b5a55a60b6 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.13 2003/07/24 13:50:25 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */ #ifndef OPAQUE_H #define OPAQUE_H diff --git a/include/os.h b/include/os.h index 4d45b571f4..e9328c8fa9 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/os.h,v 3.53 2003/10/29 04:17:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/os.h,v 3.54 2003/10/30 21:21:06 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/pixmap.h b/include/pixmap.h index 6cea329ece..56bb675aee 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$ */ +/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 1b0df9fd37..d5bc212730 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$ */ +/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */ #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H diff --git a/include/property.h b/include/property.h index 21a38d51c3..66103bc8ed 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.3 2001/12/14 19:59:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */ #ifndef PROPERTY_H #define PROPERTY_H diff --git a/include/propertyst.h b/include/propertyst.h index 177fca1716..5c335d0384 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.2 2001/01/17 22:36:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */ #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H diff --git a/include/regionstr.h b/include/regionstr.h index aec9aeeb28..29fcfbac45 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.12tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */ #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H diff --git a/include/resource.h b/include/resource.h index 49c1898694..6517ab2128 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.11 2002/03/06 21:14:04 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 diff --git a/include/screenint.h b/include/screenint.h index b3e76c4c21..988a7416c8 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.5 2001/12/14 19:59:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */ #ifndef SCREENINT_H #define SCREENINT_H diff --git a/include/scrnintstr.h b/include/scrnintstr.h index edd14c12f0..0f1813c007 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.12 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */ #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H diff --git a/include/servermd.h b/include/servermd.h index 6c72081170..654e1411b4 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.56tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.57 2003/11/03 05:11:59 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/include/site.h b/include/site.h index be8c003da3..1c272fc3f4 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.8 2001/12/19 21:37:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */ #ifndef SITE_H #define SITE_H diff --git a/include/swaprep.h b/include/swaprep.h index 2c026c6595..b6671e7d94 100644 --- a/include/swaprep.h +++ b/include/swaprep.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.0 1996/04/15 11:34:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/swaprep.h,v 3.1 2003/04/27 21:31:05 herrb Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/swapreq.h b/include/swapreq.h index 9c59bbf843..59ba8c5be8 100644 --- a/include/swapreq.h +++ b/include/swapreq.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.3 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/swapreq.h,v 1.4 2003/11/17 22:20:43 dawes Exp $ */ /************************************************************ Copyright 1996 by Thomas E. Dickey diff --git a/include/validate.h b/include/validate.h index 467533d223..2a13962a7a 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.4 2001/01/17 22:36:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ #ifndef VALIDATE_H #define VALIDATE_H diff --git a/include/window.h b/include/window.h index 5056512b84..0c886559ec 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$ */ +/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */ #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 8e8d2542a8..2dce443d37 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.6 2001/12/14 19:59:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */ #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h index cc4e519ce6..bdc1682f5a 100644 --- a/iplan2p4/ipl.h +++ b/iplan2p4/ipl.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.5 2001/01/30 22:06:21 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.6 2003/11/17 22:20:43 dawes Exp $ */ /* $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 11e3589447..57b8fce573 100644 --- a/iplan2p4/iplallpriv.c +++ b/iplan2p4/iplallpriv.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.0 1996/08/18 01:54:33 dawes Exp $ */ /* * $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 9105faa485..27470382b8 100644 --- a/iplan2p4/iplbitblt.c +++ b/iplan2p4/iplbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.2 2003/11/10 18:22:45 tsi Exp $ */ /* * ipl copy area */ diff --git a/iplan2p4/iplblt.c b/iplan2p4/iplblt.c index f303859cd7..8a48bd9da4 100644 --- a/iplan2p4/iplblt.c +++ b/iplan2p4/iplblt.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.0 1996/08/18 01:54:35 dawes Exp $ */ /* * ipl copy area */ diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index 47b895ea4a..9d2b571db0 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.0 1996/08/18 01:54:36 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index dd096dfbd5..7cc93e90c2 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.0 1996/08/18 01:54:38 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c index 422d102919..5719ca3080 100644 --- a/iplan2p4/iplbstore.c +++ b/iplan2p4/iplbstore.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.0 1996/08/18 01:54:39 dawes Exp $ */ /*- * iplbstore.c -- diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c index 3b73b1481e..21abfdbb31 100644 --- a/iplan2p4/iplcmap.c +++ b/iplan2p4/iplcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.0 1996/08/18 01:54:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.1 1998/11/22 10:37:41 dawes Exp $ */ /* $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 50e4a81ab2..c77db6b63f 100644 --- a/iplan2p4/iplfillarc.c +++ b/iplan2p4/iplfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.0 1996/08/18 01:54:41 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c index 7af2fa4fa1..512c480480 100644 --- a/iplan2p4/iplfillrct.c +++ b/iplan2p4/iplfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.0 1996/08/18 01:54:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ /* * Fill rectangles. */ diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c index 767db30cbf..010f911f65 100644 --- a/iplan2p4/iplfillsp.c +++ b/iplan2p4/iplfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.0 1996/08/18 01:54:43 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c index 8a69cb7c8b..794a62609b 100644 --- a/iplan2p4/iplgc.c +++ b/iplan2p4/iplgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.0 1996/08/18 01:54:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 8ae61b6cc9..271656bda0 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.0 1996/08/18 01:54:47 dawes Exp $ */ /* $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 1bcb57d576..6374e4d195 100644 --- a/iplan2p4/iplhrzvert.c +++ b/iplan2p4/iplhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.0 1996/08/18 01:54:48 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c index 6c8e9ab73f..0522309b4d 100644 --- a/iplan2p4/iplimage.c +++ b/iplan2p4/iplimage.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.0 1996/08/18 01:54:49 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c index f596386939..479bfb00a2 100644 --- a/iplan2p4/iplline.c +++ b/iplan2p4/iplline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.0 1996/08/18 01:54:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h index b188ec3ecf..2e0a2b3cc1 100644 --- a/iplan2p4/iplmap.h +++ b/iplan2p4/iplmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.1 1998/04/05 16:42:26 robin Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.2 2001/07/25 15:05:09 dawes Exp $ */ /* * $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 22f3b4d5ff..fa537d3a70 100644 --- a/iplan2p4/iplmergerop.h +++ b/iplan2p4/iplmergerop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ #ifndef _IPLANMERGEROP_H_ #define _IPLANMERGEROP_H_ diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c index d408b804e0..9f1d37dfb8 100644 --- a/iplan2p4/iplmskbits.c +++ b/iplan2p4/iplmskbits.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.c,v 3.0 1996/08/18 01:54:54 dawes Exp $ */ /* 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 51bb263934..4fb3fe0669 100644 --- a/iplan2p4/iplmskbits.h +++ b/iplan2p4/iplmskbits.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmskbits.h,v 3.0 1996/08/18 01:54:55 dawes Exp $ */ /* 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 a6ca6f12b8..96072895c9 100644 --- a/iplan2p4/iplpack.c +++ b/iplan2p4/iplpack.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.c,v 3.0 1996/08/18 01:54:56 dawes Exp $ */ /* 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 53c2c988fc..9545c75ec7 100644 --- a/iplan2p4/iplpack.h +++ b/iplan2p4/iplpack.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpack.h,v 3.0 1996/08/18 01:54:57 dawes Exp $ */ /* 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 7800e8d96e..212f94979a 100644 --- a/iplan2p4/iplpixmap.c +++ b/iplan2p4/iplpixmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.0 1996/08/18 01:54:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.1 2001/12/17 20:00:46 dawes Exp $ */ /* $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 fc73f2065e..f73bc8864f 100644 --- a/iplan2p4/iplply1rct.c +++ b/iplan2p4/iplply1rct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.0 1996/08/18 01:55:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ /* * $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 88dbad6bf7..a5a61194a7 100644 --- a/iplan2p4/iplpntwin.c +++ b/iplan2p4/iplpntwin.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.0 1996/08/18 01:55:01 dawes Exp $ */ /* $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 763733a04f..3d90edea41 100644 --- a/iplan2p4/iplpolypnt.c +++ b/iplan2p4/iplpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.0 1996/08/18 01:55:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c index 75ec557ee7..cfc43c130e 100644 --- a/iplan2p4/iplrrop.c +++ b/iplan2p4/iplrrop.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.0 1996/08/18 01:55:03 dawes Exp $ */ /* * $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 31e7b79b1e..d14d1a54be 100644 --- a/iplan2p4/iplrrop.h +++ b/iplan2p4/iplrrop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.0 1996/08/18 01:55:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ /* 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 00dbef0749..1d79157765 100644 --- a/iplan2p4/iplscrinit.c +++ b/iplan2p4/iplscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.2 1998/06/27 12:55:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.3 1998/11/22 10:37:41 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index 52eefc31d2..0533eed71d 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.0 1996/08/18 01:55:07 dawes Exp $ */ /* $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 447193b272..2f741ed7f6 100644 --- a/iplan2p4/iplsolid.c +++ b/iplan2p4/iplsolid.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.0 1996/08/18 01:55:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ /* * $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 8414bc7b26..4d82a655ab 100644 --- a/iplan2p4/ipltegblt.c +++ b/iplan2p4/ipltegblt.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.0 1996/08/18 01:55:09 dawes Exp $ */ /* $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 6774de8340..ea608effb3 100644 --- a/iplan2p4/ipltile32.c +++ b/iplan2p4/ipltile32.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.0 1996/08/18 01:55:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ /* * 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 abd4a30214..a63ce5da67 100644 --- a/iplan2p4/ipltileodd.c +++ b/iplan2p4/ipltileodd.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.0 1996/08/18 01:55:11 dawes Exp $ */ /* * Fill odd tiled rectangles and spans. * no depth dependencies. diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c index 8d95e284bd..39d1eff9b6 100644 --- a/iplan2p4/iplwindow.c +++ b/iplan2p4/iplwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.0tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.1 2003/11/10 18:22:45 tsi Exp $ */ /* $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 b1366aa3fa..25ef344267 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.9 2001/08/23 14:46:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */ #include #define NEED_REPLIES diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c index c392e6415e..5a40614f61 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.7 2001/08/23 14:46:57 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c index 7ae70ebde8..d611a7f2c6 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.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */ #include "X.h" #include "Xproto.h" diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c index 5a468ecbf6..6eb7af1970 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.3 2001/01/17 22:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c index 443bb04141..1a82ce3b3e 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.12 2001/10/28 03:34:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */ #include #define NEED_REPLIES diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c index fdef2db7c4..461f0d7783 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.5 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */ #ifdef OPTDEBUG #include diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c index 9082250d67..e9a6d8a8ee 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.4 2001/05/15 10:19:43 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ /* various bits of DIX-level mangling */ diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h index eeff648042..40a2ff0ae9 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.4 2001/08/01 00:44:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ #ifndef _LBXSERVE_H_ diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c index f3dc131637..d716470910 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.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #include "X.h" diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h index ea7f2420e5..eeb94f2660 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.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #ifndef _LBX_SRVOPTS_H_ #define _LBX_SRVOPTS_H_ diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c index 23fdd30f7c..edfc0bea7b 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.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #include #define NEED_REPLIES diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c index 26a635f6f9..e071846e3e 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.2 2000/05/18 23:46:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #include "dix.h" extern int ProcInitialConnection(ClientPtr client); diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index 6fdc4d5a21..5b1d65a4a6 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.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #include "X.h" #include "misc.h" diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h index 376a4cc273..e451ad091a 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.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #ifndef _LBXTAGS_H_ #define _LBXTAGS_H_ diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c index 20d58b37be..50b4247080 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.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */ /* * This module handles zeroing out unused pad bytes in core X replies. diff --git a/mfb/fastblt.h b/mfb/fastblt.h index f25541f551..f647eb6bae 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.4 2001/01/17 22:37:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.5 2001/12/14 20:00:03 dawes Exp $ */ /* * Fast bitblt macros for certain hardware. If your machine has an addressing diff --git a/mfb/maskbits.c b/mfb/maskbits.c index 09f593ec2a..4f3e0087b8 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.5 2001/01/17 22:37:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.6 2001/12/14 20:00:03 dawes Exp $ */ #include "maskbits.h" #include "servermd.h" diff --git a/mfb/maskbits.h b/mfb/maskbits.h index 4cd30be39d..7117316609 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.8tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.9 2003/02/18 21:30:00 tsi Exp $ */ /* 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 e54e1f9060..ee3a33fe94 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.13 2001/10/28 03:34:13 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */ #ifndef _MERGEROP_H_ #define _MERGEROP_H_ diff --git a/mfb/mfb.h b/mfb/mfb.h index 267ebc4eae..01e09f195e 100644 --- a/mfb/mfb.h +++ b/mfb/mfb.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.21 2003/07/16 03:35:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfb.h,v 1.22 2003/11/17 22:20:44 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 6e950e8370..310d492f84 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbitblt.c,v 1.8 2003/11/10 18:22:45 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index ca240ba991..59968110b1 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.3 2001/10/28 03:34:14 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.4 2001/12/14 20:00:04 dawes Exp $ */ /* diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index b1fad2192d..d43bd2e009 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.4 2001/01/17 22:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index a7ffdc36c9..182744d6ed 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.4 2001/01/17 22:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 3b36819ef3..d23071cd3f 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index 253399df47..d5dfbf47fe 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 9e65d83400..886c2852a4 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.5 2001/12/14 20:00:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index aa90f411bd..cd1b668459 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.6 2003/02/18 21:30:01 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 8fd4c0f292..5a095757f0 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.8 2001/01/17 22:37:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.9 2001/12/14 20:00:06 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index aec4c2e7fb..1119f66f9e 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.9 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index b63a184f80..59bd7e5385 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index 626ef67fb4..237e337f50 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.5 2001/12/14 20:00:08 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index 1fb40db5aa..4d616ed8b0 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.5 2001/01/17 22:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index aa948a34e6..066ca3ce76 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.5tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbline.c b/mfb/mfbline.c index b8e1d36481..e7e6789830 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.6 2001/01/17 22:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index f3f8decc76..980e57246b 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.7tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.8 2002/12/09 04:10:57 tsi Exp $ */ #include "X.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index 5e4a619bed..61a7297f04 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index 5c99d03deb..38cd4aee88 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.4 2001/01/17 22:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.5 2001/12/14 20:00:11 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index 0410af192c..f10e390463 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c index 12ccf60793..28b0c24c39 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.3tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ #include "mfb.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index c85d4e36b0..d07aadb80d 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.8tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.9 2003/02/18 21:30:01 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index 66da37d1d5..a56935dbea 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.6tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index b0e02850c8..1e0da0f021 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -47,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.8 2001/12/14 20:00:12 dawes Exp $ */ #include "X.h" #include "Xmd.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index 50b261114d..e672f38c9d 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.3 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 294083f787..f7ff963c4b 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$ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index ad46732ab8..1ef9f1f565 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.7 2002/09/27 01:57:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/cbrt.c b/mi/cbrt.c index cfc8d84dae..44c836e430 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.3 2001/05/29 22:24:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.4 2001/12/14 20:00:19 dawes Exp $ */ /* simple cbrt, in case your math library doesn't have a good one */ diff --git a/mi/mi.h b/mi/mi.h index 388a90b279..fba57567dc 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.9 2001/08/06 20:51:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */ #ifndef MI_H #define MI_H diff --git a/mi/miarc.c b/mi/miarc.c index 5dabfbaab1..160119563f 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mibank.c b/mi/mibank.c index 1f1087b88f..11708434c3 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.15 2003/11/10 18:39:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.16 2004/01/05 16:42:10 tsi Exp $ */ /* * This thing originated from an idea of Edwin Goei and his bank switching diff --git a/mi/mibank.h b/mi/mibank.h index cf27d1fae6..eac53db206 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.10 2003/01/01 19:16:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.11 2004/01/05 16:42:10 tsi Exp $ */ #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 82e34cdbeb..f0228212c7 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.10 2001/08/06 20:51:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.11 2001/12/14 20:00:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mibstore.c b/mi/mibstore.c index 1cd35c4dde..e04e5410ca 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -42,7 +42,7 @@ implied warranty. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.11 2003/11/10 18:22:47 tsi Exp $ */ #define NEED_EVENTS #include "X.h" diff --git a/mi/mibstore.h b/mi/mibstore.h index fb58975c6d..e8f197dbc5 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -16,7 +16,7 @@ */ -/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.5 2001/08/06 20:51:18 dawes Exp $ */ #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/mibstorest.h b/mi/mibstorest.h index fec3c9712c..249b4d4d31 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.4 2001/01/17 22:37:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.5 2001/12/14 20:00:21 dawes Exp $ */ #include "mibstore.h" #include "regionstr.h" diff --git a/mi/miclipn.c b/mi/miclipn.c index 456ad08c40..95272c1765 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.3 2001/08/06 21:46:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ #include "X.h" #include "windowstr.h" diff --git a/mi/micmap.c b/mi/micmap.c index 018244a2a3..b3e925a09f 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.10 2000/09/20 00:09:14 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.11 2001/05/29 22:24:06 dawes Exp $ */ /* * This is based on cfbcmap.c. The functions here are useful independently diff --git a/mi/micmap.h b/mi/micmap.h index ca2a417bed..557ae63d5f 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.7 2000/09/20 00:09:15 keithp Exp $ */ #include "colormapst.h" diff --git a/mi/micursor.c b/mi/micursor.c index 5da44c3518..4c95d2f496 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.3 2001/12/14 20:00:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/midash.c b/mi/midash.c index 0152db7ca0..bc33b0c20d 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.5 2003/07/16 01:38:56 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/midispcur.c b/mi/midispcur.c index 08c9f92165..ca85fc3d10 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.9 2002/12/09 04:10:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.10 2003/03/06 05:52:58 mvojkovi Exp $ */ #define NEED_EVENTS # include "X.h" diff --git a/mi/mieq.c b/mi/mieq.c index a0ed3fdcec..699d4130ca 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.2 2001/05/25 18:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ /* * mieq.c diff --git a/mi/miexpose.c b/mi/miexpose.c index 688b73558d..07efa754cd 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.9tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mifillarc.c b/mi/mifillarc.c index c8b901c85b..fa37d45be1 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.8 2003/07/16 01:38:56 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mifillarc.h b/mi/mifillarc.h index ff39bac1dc..ed8503f15a 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.6 2001/10/25 12:03:47 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mifillrct.c b/mi/mifillrct.c index 31219869eb..be2c58dfe7 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.2 2001/05/29 22:24:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 79f606b4d7..837cf7b205 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.3 2001/10/25 12:03:47 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.4 2001/12/14 20:00:22 dawes Exp $ */ #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index ae41cf6f68..93999ea7d5 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.2 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.3 2001/12/14 20:00:23 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/migc.c b/mi/migc.c index b5b33852a4..29eec97494 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.8 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.9 2001/12/14 20:00:23 dawes Exp $ */ #include "scrnintstr.h" #include "gcstruct.h" diff --git a/mi/migc.h b/mi/migc.h index d906c63344..8cb5a56c9a 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.7 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.h,v 1.8 2001/12/14 20:00:23 dawes Exp $ */ extern void miChangeGC( GCPtr /*pGC*/, diff --git a/mi/miglblt.c b/mi/miglblt.c index f2a748db6d..3e7e5da1b2 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.5 2001/05/29 22:24:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.6 2001/12/14 20:00:23 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miinitext.c b/mi/miinitext.c index ea4a2c22fa..ee63aa41b3 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miline.h b/mi/miline.h index f52a51ebda..8977550b3d 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.6 2001/08/06 20:51:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.7 2001/12/14 20:00:24 dawes Exp $ */ #ifndef MILINE_H diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 74cd18022d..cdb2058b15 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.16 2003/11/10 18:22:49 tsi Exp $ */ #include "X.h" #include "scrnintstr.h" diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 64045f45c1..6098f9c390 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.4 2001/04/14 21:15:26 mvojkovi Exp $ */ #ifndef __MIOVERLAY_H #define __MIOVERLAY_H diff --git a/mi/mipointer.c b/mi/mipointer.c index 2e4ee607bf..58d93b80b7 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.9 2001/09/04 14:03:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.10 2001/12/14 20:00:24 dawes Exp $ */ # define NEED_EVENTS # include "X.h" diff --git a/mi/mipointer.h b/mi/mipointer.h index f8e7fd0844..0486fc5a3b 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.8 2001/08/06 20:51:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.9 2001/12/14 20:00:24 dawes Exp $ */ #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index 682f8ac881..ab53722295 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.3 2001/04/19 14:14:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mipoly.c b/mi/mipoly.c index 2c420b2503..ad69d7062a 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.3 2003/07/16 01:38:56 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipoly.h b/mi/mipoly.h index 88a1782de8..42d973477a 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.2 2001/08/06 20:51:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ /* diff --git a/mi/mipolycon.c b/mi/mipolycon.c index de33045ef6..d99ed83d7d 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolygen.c b/mi/mipolygen.c index 484a29798b..bbeb05dc39 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index f88545cfd3..ed19f5f689 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.2 2001/05/29 22:24:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 07964cf82f..298ba23856 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index fe49939143..cb6bb7550b 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipolytext.c b/mi/mipolytext.c index a3f64a0867..9084fe1800 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.2 2001/08/06 20:51:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ /******************************************************************* Copyright 1987, 1998 The Open Group diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index 9a74222236..7ffeadd863 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.9 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 019ba437e3..0c8d32ae66 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.12 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/miregion.c b/mi/miregion.c index 83a2319fd9..ef666c321f 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.9 2003/04/23 21:51:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 7f8ee48ad0..edb5f7d78c 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.15tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.16 2003/04/23 21:51:53 tsi Exp $ */ #include "X.h" #include "servermd.h" diff --git a/mi/mispans.c b/mi/mispans.c index 84a737525e..81fa45da76 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.3 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.4 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group diff --git a/mi/mispans.h b/mi/mispans.h index b6e97e2b4a..5ae2d014ad 100644 --- a/mi/mispans.h +++ b/mi/mispans.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group diff --git a/mi/misprite.c b/mi/misprite.c index 260a4dac04..d323f11684 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.10tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.11 2002/12/09 04:10:58 tsi Exp $ */ # include "X.h" # include "Xproto.h" diff --git a/mi/misprite.h b/mi/misprite.h index b4cc84ecf0..a7e19f7cb5 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.2 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.3 2001/12/14 20:00:27 dawes Exp $ */ typedef struct { Bool (*RealizeCursor)( diff --git a/mi/mispritest.h b/mi/mispritest.h index e438dd7d2f..eddc16c2d2 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.4 2001/01/17 22:37:07 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.5 2001/12/14 20:00:27 dawes Exp $ */ # include "misprite.h" #ifdef RENDER diff --git a/mi/mistruct.h b/mi/mistruct.h index 98879b72d4..0744b25938 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$ */ +/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/mivalidate.h b/mi/mivalidate.h index c25e5d5bcb..c1ef15bb1c 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$ */ +/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ #ifndef MIVALIDATE_H diff --git a/mi/mivaltree.c b/mi/mivaltree.c index d635175641..90ba5d98ef 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.9tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ /* * Aug '86: Susan Angebranndt -- original code diff --git a/mi/miwideline.c b/mi/miwideline.c index 8888ca8bde..84b4346f29 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.12 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.13 2003/07/16 01:38:57 dawes Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwideline.h b/mi/miwideline.h index 96d6aae861..f32a1e8fe4 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.11 2001/10/25 12:03:47 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ /* Author: Keith Packard, MIT X Consortium */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 4eac9226cb..9c962ee4e0 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.9tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerarc.c b/mi/mizerarc.c index e36b2f3f0f..e2233e78e2 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.6 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.7 2003/07/16 01:38:59 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mizerarc.h b/mi/mizerarc.h index 99062d1924..4a52efa299 100644 --- a/mi/mizerarc.h +++ b/mi/mizerarc.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.3 2001/12/14 20:00:28 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 304f525ae7..fa1863b54b 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.2 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.3 2001/12/14 20:00:29 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mizerline.c b/mi/mizerline.c index 4672f6bd33..d1fbf631ef 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.6 2001/08/06 20:51:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.7 2001/12/14 20:00:29 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/miext/layer/layer.h b/miext/layer/layer.h index 09ab43540c..6304380576 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.4 2001/08/01 00:44:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layer.h,v 1.5 2002/10/03 22:50:21 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c index d01787b109..52490d286a 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.4 2001/08/27 03:55:46 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layergc.c,v 1.5 2001/10/28 03:34:15 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c index 4e49c9b15d..6cbca71509 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.6tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerinit.c,v 1.7 2003/11/10 18:22:49 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c index eb3fec8976..ef412a2c55 100644 --- a/miext/layer/layerpict.c +++ b/miext/layer/layerpict.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/layer/layerpict.c,v 1.2 2003/08/22 19:27:32 eich Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index 8dcba062dd..401dfd96f3 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.2 2001/06/04 09:45:41 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c index 177df4e355..44a5df24c6 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.7tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerwin.c,v 1.8 2003/11/10 18:22:49 tsi Exp $ * * 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 dab0c6f467..56afd73317 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/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlAccel.h,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ /* * rlBlt.c diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c index 6711c500ef..ba6fdf2276 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/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlBlt.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c index 8e063a3475..cbd58b4cfc 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/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlCopy.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c index e33b40d458..7fd7adfa86 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/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFill.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c index ca39852981..2ce9eae2b6 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/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillRect.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c index b91f734c1c..fd5ee35f56 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/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlFillSpans.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c index da28204eb8..2bf2da64b3 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/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "fontstruct.h" diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c index 4ff4798c13..e2249569b9 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/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlSolid.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index aefefcab20..2b375706f1 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.5 2003/10/18 00:00:34 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.6 2003/10/24 00:33:14 torrey Exp $ */ #ifndef _ROOTLESS_H #define _ROOTLESS_H diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index 85655a9e11..bc6259ea65 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.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.5 2003/11/10 18:22:50 tsi Exp $ */ #include "rootlessCommon.h" diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index c75c45a2ee..973ec62917 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.3 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.4 2003/09/16 00:36:20 torrey Exp $ */ #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index 93e987fe7e..1a1a48a4a3 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.1 2003/04/15 01:05:44 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index b370d2beb1..8c70135a10 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.1 2003/04/15 01:05:44 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ #include "mi.h" #include "scrnintstr.h" diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 21c62c4ef6..beb737df18 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.2 2003/04/30 23:15:35 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.3 2003/06/30 01:45:13 torrey Exp $ */ #include "mi.h" diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index ad1fa353ad..a959179395 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.1tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.2 2003/11/10 18:22:50 tsi Exp $ */ /* * mivaltree.c -- diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index a0fccf490c..b970399c74 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.10 2003/11/13 20:26:31 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.11 2003/11/27 01:53:39 torrey Exp $ */ #include "rootlessCommon.h" #include "rootlessWindow.h" diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index 6c26bace30..f6736f5441 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.1 2003/04/15 01:05:44 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H diff --git a/miext/rootless/safeAlpha/safeAlpha.h b/miext/rootless/safeAlpha/safeAlpha.h index 63922aeec5..90efec5c84 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.2 2003/10/18 00:00:34 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlpha.h,v 1.3 2004/01/19 01:22:48 torrey Exp $ */ #ifndef _SAFEALPHA_H #define _SAFEALPHA_H diff --git a/miext/rootless/safeAlpha/safeAlphaPicture.c b/miext/rootless/safeAlpha/safeAlphaPicture.c index a10e7456ca..3c9d396280 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.3 2003/10/24 00:33:15 torrey Exp $ */ + /* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaPicture.c,v 1.4 2004/01/19 01:22:48 torrey Exp $ */ #ifdef RENDER diff --git a/miext/rootless/safeAlpha/safeAlphaWindow.c b/miext/rootless/safeAlpha/safeAlphaWindow.c index 31db64fd86..51acb01c5c 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.1 2003/09/16 00:36:20 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/01/19 01:22:48 torrey Exp $ */ #include "fb.h" #include "safeAlpha.h" diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 260c840a59..38a92953fd 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.14tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index d343a171f8..d8ade93dc6 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.6tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.h,v 1.7 2002/12/02 20:37:24 tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 9edd8338e2..028ec26a5b 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 4414097766..818a37a8e1 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.4 2001/05/29 04:54:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index aaa6d58eb6..1487829567 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.3 2001/05/29 04:54:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index 3d4a3724d3..c82b5f9317 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.3 2001/05/29 04:54:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index 16b146352f..a1ff273de0 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index 3786444d4c..7ba41833e7 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index d2c9271f47..0b3c4e0acb 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 36cf944899..574b3a157e 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot16pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 3ef791608f..327636efb4 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack.c,v 1.1 2000/09/08 21:46:45 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 943d6485e5..8386222678 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index 0038c624cf..b0dd283161 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 1183ba65a2..9bdb18e258 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot32pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index 885c5e9a2f..7af181f198 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack.c,v 1.1 2000/09/08 21:46:46 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 7bdb2a9321..316c0c690e 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_180.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index 483f05f799..bed542f6d3 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_270.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index 8c93d21ed0..f2618fc477 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/miext/shadow/shrot8pack_90.c,v 1.1 2001/05/29 04:54:13 keithp Exp $ * * Copyright © 2000 Keith Packard * diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index a0f5b6e067..1277c2ee1c 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.4tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index 507cabb563..ce9b4c5614 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.3 2001/05/29 04:54:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $ * * Copyright © 2000 Keith Packard * diff --git a/os/WaitFor.c b/os/WaitFor.c index 3283dd5cf1..615392d646 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.42 2003/10/16 01:33:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.44 2004/02/17 15:30:26 eich Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/access.c b/os/access.c index 53dede0ed9..14b61839cf 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.53 2004/01/02 18:23:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/access.c,v 3.54 2004/01/03 17:38:39 herrb Exp $ */ #ifdef WIN32 #include diff --git a/os/auth.c b/os/auth.c index 40f34ffff2..a1cbc8c1fa 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: auth.c,v 1.13 2003/04/27 21:31:08 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.14 2003/08/27 19:57:21 herrb Exp $ */ /* * authorization hooks for the server diff --git a/os/connection.c b/os/connection.c index 40c80d3428..7465e7eff2 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.64 2003/10/07 22:50:42 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.65 2003/10/30 21:21:10 herrb Exp $ */ /***************************************************************** * Stuff to create connections --- OS dependent * diff --git a/os/io.c b/os/io.c index 956a533000..cf8a0343eb 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.34 2002/05/31 18:46:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/io.c,v 3.35 2003/04/27 21:31:08 herrb Exp $ */ #if 0 #define DEBUG_COMMUNICATION diff --git a/os/k5auth.c b/os/k5auth.c index 3726df6ba2..8c59fe8ab2 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.4 2001/01/17 22:37:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.5 2001/12/14 20:00:34 dawes Exp $ */ /* * Kerberos V5 authentication scheme diff --git a/os/lbxio.c b/os/lbxio.c index ba79040b53..ae4d4355f4 100644 --- a/os/lbxio.c +++ b/os/lbxio.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.18 2003/04/27 21:31:09 herrb Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/os/mitauth.c b/os/mitauth.c index 97f88b2328..bddbdf1d6b 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.4 2001/01/17 22:37:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.5 2001/12/14 20:00:34 dawes Exp $ */ /* * MIT-MAGIC-COOKIE-1 authorization scheme diff --git a/os/oscolor.c b/os/oscolor.c index 557d539bb8..f6e941fb8c 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.10 2003/07/16 01:39:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.11 2003/09/24 02:43:36 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/osdep.h b/os/osdep.h index 2b9eb5674e..a5392ffc34 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.17 2002/05/31 18:46:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.18 2003/04/27 21:31:09 herrb Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/osinit.c b/os/osinit.c index 1a5ff0501a..1c56d0af78 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.29 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.30 2003/10/29 04:17:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/os/rpcauth.c b/os/rpcauth.c index f0693f5990..512b3ecb5f 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.7 2001/12/14 20:00:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.8 2003/04/27 21:31:09 herrb Exp $ */ /* * SUN-DES-1 authentication mechanism diff --git a/os/secauth.c b/os/secauth.c index 8c30eaafbc..4f90fe9a96 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.10 2001/08/01 00:44:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.11 2001/12/14 20:00:35 dawes Exp $ */ #include "X.h" #include "os.h" diff --git a/os/strlcat.c b/os/strlcat.c index 7031de3a6a..cda5c6ab99 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$ */ +/* $XFree86: xc/lib/misc/strlcat.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ #include diff --git a/os/strlcpy.c b/os/strlcpy.c index 71657da69b..14e45ef8c1 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$ */ +/* $XFree86: xc/lib/misc/strlcpy.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ #include #include diff --git a/os/utils.c b/os/utils.c index c5c560a7e8..924d974711 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.96 2004/01/07 04:16:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.97 2004/01/09 00:35:06 dawes Exp $ */ #ifdef __CYGWIN__ #include diff --git a/os/xalloc.c b/os/xalloc.c index 6412deb335..8bb46e2c9a 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.35tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.36 2003/11/03 05:12:00 tsi Exp $ */ /* 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 4ec7265ddf..13695c13c6 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: xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.9 2003/06/24 15:44:48 eich Exp $ */ /* * XDM-AUTHENTICATION-1 (XDMCP authentication) and diff --git a/os/xdmcp.c b/os/xdmcp.c index bc6a9d4f1f..cbd43f45ba 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.31 2003/12/30 21:24:32 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.32 2004/01/01 17:09:29 herrb Exp $ */ #ifdef WIN32 /* avoid conflicting definitions */ diff --git a/randr/mirandr.c b/randr/mirandr.c index 1dc173a964..b45a1f9a82 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.5 2001/06/04 09:45:40 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randr.c b/randr/randr.c index b253ddbab8..c0a8c4bf89 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.21tsi Exp $ + * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. diff --git a/randr/randrstr.h b/randr/randrstr.h index 48213185cb..d966cd5b71 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.5 2002/09/29 23:39:45 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $ * * Copyright © 2000 Compaq Computer Corporation * diff --git a/record/record.c b/record/record.c index 7bdd00c93a..3657ef42b9 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.11 2003/11/03 05:12:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */ #define NEED_EVENTS #include "dixstruct.h" diff --git a/record/set.c b/record/set.c index 3415166642..847a1b28da 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.7 2001/12/14 20:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */ /* diff --git a/record/set.h b/record/set.h index 6f0b872a19..169077720d 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$ */ +/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension diff --git a/render/animcur.c b/render/animcur.c index b00cdf682e..fcf6a25a77 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.5tsi Exp $ + * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.6 2003/11/03 05:12:01 tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/filter.c b/render/filter.c index 4435197e26..a2f7563cb4 100644 --- a/render/filter.c +++ b/render/filter.c @@ -1,5 +1,5 @@ /* - * $XFree86$ + * $XFree86: xc/programs/Xserver/render/filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/glyph.c b/render/glyph.c index 5dd700581f..b4f08c2232 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.5 2001/01/30 07:01:22 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/glyph.c,v 1.6 2001/10/28 03:34:19 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/glyphstr.h b/render/glyphstr.h index 68d6f2085f..99f55e3eb5 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.4 2001/01/21 21:19:39 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miglyph.c b/render/miglyph.c index 8d0c2079bc..00b6764d62 100644 --- a/render/miglyph.c +++ b/render/miglyph.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.4 2000/11/20 07:13:13 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/miglyph.c,v 1.6 2000/12/05 03:13:31 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/miindex.c b/render/miindex.c index aff610940c..739348273f 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.7 2002/11/05 06:05:04 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/miindex.c,v 1.8 2002/11/06 22:45:36 keithp Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mipict.c b/render/mipict.c index ed97acc7bc..0f0cf6c8b9 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.15tsi Exp $ + * $XFree86: xc/programs/Xserver/render/mipict.c,v 1.16 2003/11/10 18:22:52 tsi Exp $ * * Copyright © 1999 Keith Packard * diff --git a/render/mipict.h b/render/mipict.h index 4af4c56beb..0154fb5f01 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.12 2002/11/05 05:34:40 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mipict.h,v 1.13 2002/11/06 22:45:36 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/mirect.c b/render/mirect.c index 63e9c7cc47..33c7a9f148 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.3 2000/12/08 07:52:05 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mirect.c,v 1.4 2001/06/08 19:36:34 keithp Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitrap.c b/render/mitrap.c index 05db36ec8e..7f592ccd48 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.8 2002/09/03 19:28:28 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mitrap.c,v 1.9 2002/11/05 23:39:16 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/mitri.c b/render/mitri.c index b0526256df..fc706f117a 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.5 2002/05/31 16:48:52 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/mitri.c,v 1.6 2002/08/12 04:03:21 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/render/picture.c b/render/picture.c index ad746b2776..b2ef69bdfb 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.c,v 1.29 2002/11/23 02:38:15 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/picture.c,v 1.30 2003/01/26 16:40:43 eich Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/picture.h b/render/picture.h index 379e8fb596..c47d519416 100644 --- a/render/picture.h +++ b/render/picture.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.h,v 1.20tsi Exp $ + * $XFree86: xc/programs/Xserver/render/picture.h,v 1.21 2003/11/03 05:12:01 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/picturestr.h b/render/picturestr.h index affb625701..cb5ea0ac95 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.21 2002/11/06 22:45:36 keithp Exp $ + * $XFree86: xc/programs/Xserver/render/picturestr.h,v 1.22 2002/11/23 02:38:15 keithp Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/render/render.c b/render/render.c index 496203d30f..0d89885c38 100644 --- a/render/render.c +++ b/render/render.c @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ + * $XFree86: xc/programs/Xserver/render/render.c,v 1.28 2003/11/03 05:12:02 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index a6fec50f57..5bc7f65fc9 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.5 2001/01/17 19:41:48 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index 6aa41d06e1..209631e723 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.4 2001/01/17 19:41:48 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index d1fd14f27e..20def46ba0 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.11 2001/01/17 19:41:48 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index afc0dbebdf..06660ff89e 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.5 2001/10/28 03:32:33 tsi Exp $ */ +/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */ #ifndef XKB_IN_SERVER diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c index 6eee7e097a..bb02619f35 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.9 2002/12/05 21:59:00 paulo Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.10 2003/11/17 22:20:44 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c index c4a6ec7a08..2485488d20 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.8 2002/12/20 20:18:35 paulo Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index 16c9f15b96..c7c8f18b89 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.3 2001/01/17 22:37:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index 0ce401adb4..5f5ebc9b4f 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.3 2001/08/23 21:49:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 033aa18ea0..9f54cae6ff 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$ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxFakeBtn.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index a6ab0db7f3..289fa3bfb2 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.5 2003/09/13 16:39:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.6 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index dea4ce607c..a8c436ea2d 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$ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxInit.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index c0b2b80187..afd028fcd2 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$ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxKeyClick.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 98744ed97e..9ac7d33007 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.3 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index e7c484cab8..ab757c6fc6 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$ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxLEDs.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 30510ffaae..5101de53b4 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.8 2003/07/16 01:39:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ #include #include diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index ed61becb0c..9f7704c5ac 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.35 2003/10/02 13:30:12 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.36 2003/11/17 22:20:45 dawes Exp $ */ #include #include diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index 852e2386f4..dd7ef4630a 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.3 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index bbd0d1ac1b..ec43f79db1 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.3 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/maprules.c b/xkb/maprules.c index 330f9fe90d..c588ae399d 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.17 2002/11/26 01:43:25 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */ #include #include diff --git a/xkb/xkb.c b/xkb/xkb.c index fcc156d355..f43fb285ff 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.22tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.23 2003/12/22 17:48:11 tsi Exp $ */ #include #include "X.h" diff --git a/xkb/xkb.h b/xkb/xkb.h index 704cd49c0d..4eeb781db8 100644 --- a/xkb/xkb.h +++ b/xkb/xkb.h @@ -1,4 +1,4 @@ -/* $XFree86$ */ +/* $XFree86: xc/programs/Xserver/xkb/xkb.h,v 1.1 2003/07/16 01:39:08 dawes Exp $ */ /* #include "XKBfile.h" */ diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 5794e34ba6..096ebe2e4e 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.9 2001/08/23 14:33:25 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.10 2003/11/17 22:20:46 dawes Exp $ */ #include #include diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 0239c678ac..403c2fb89d 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.13 2003/07/16 01:39:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.14 2003/11/17 22:20:46 dawes Exp $ */ #include #include diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h index 7ea30bde20..910616e607 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.2 2001/10/28 03:34:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.3 2003/11/17 22:20:46 dawes Exp $ */ /* This file generated automatically by xkbcomp */ /* DO NOT EDIT */ #ifndef DEFAULT_H diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 7d2421a873..0cd1becace 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.11 2003/07/16 01:39:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.12 2003/11/17 22:20:46 dawes Exp $ */ #include #define NEED_EVENTS 1 diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index b582845d95..6ed1464946 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.32tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.33 2003/12/22 17:48:12 tsi Exp $ */ #include #include diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 26e6d87d38..f75db6918f 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.7 2003/07/16 01:39:10 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.8 2003/11/17 22:20:46 dawes Exp $ */ #include #include diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 43288d3e99..3a9fc11f89 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.8 2001/01/17 22:37:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.9 2003/11/17 22:20:46 dawes Exp $ */ #include #include diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index ec155645fa..0a077f4c15 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$ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.2 2003/11/17 22:20:46 dawes Exp $ */ #include #include diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index 4b6ba4ccc0..6f4ffe8a9d 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.4 2003/09/13 16:39:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.5 2003/11/17 22:20:46 dawes Exp $ */ #include "stdio.h" #include "X.h" diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 8b439c2a56..f3ba6bc174 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.16 2003/11/03 05:12:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.17 2003/11/17 22:20:46 dawes Exp $ */ #include #include diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c index 34470ea774..0e480b4dff 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.7 2001/11/30 12:11:51 eich Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */ #include #include diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c index 351a8dac5a..d12467ff78 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.4 2001/07/29 05:01:13 tsi Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */ #include #include diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 1b83041ee6..2a6d836aa9 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.7 2003/07/16 02:31:10 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */ #include #include diff --git a/xkb/xkbout.c b/xkb/xkbout.c index 3e81d64ef8..d688aca011 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.9 2001/10/28 03:32:47 tsi Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.10 2003/11/17 22:20:24 dawes Exp $ */ #include #include diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 027642af62..fc593e7966 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.11 2002/12/21 18:49:02 paulo Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */ #include #include diff --git a/xkb/xkmread.c b/xkb/xkmread.c index cd38cbb327..b7a08e2672 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.6 2002/02/13 22:09:42 herrb Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */ #include