summaryrefslogtreecommitdiff
path: root/xc/programs
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-09-21 11:10:28 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-09-21 11:10:28 -0700
commit9b0c8f1ae9f56cb00850351f5247b035e832edd6 (patch)
treecf60362908557930f8930862b08f610f106f16e3 /xc/programs
parent8bd5170e65dcd9bf0368033942c4498928446ada (diff)
final stateHEADmaster
Diffstat (limited to 'xc/programs')
-rw-r--r--xc/programs/Imakefile2
-rw-r--r--xc/programs/Xserver/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miClip.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miNS.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miPick.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miRender.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miText.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/miWks.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/include/mixform.h2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level0/README2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c2
-rw-r--r--xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/pexDump.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/pexError.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexFont.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexLut.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexNs.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexPc.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexPick.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexSc.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexStr.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/objects/pexTM.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/ConvName.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/ConvName.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/Convert.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCTables.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCattr.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCattr.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCcolour.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCcolour.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCcolour.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/OCprim.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/RepTables.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/Replies.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/ReqTables.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/Requests.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/Requests.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/SwapConv.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/UconvName.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/UconvName.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/cOCTables.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/cOCprim.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/check.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/convEv.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/convReq.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/convReq.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/convUtil.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/convUtil.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/convertStr.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/floatconv.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/floatconv.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/uOCTables.ci2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/uOCprim.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/uconvRep.c2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/uconvRep.h2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk2
-rw-r--r--xc/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk2
-rw-r--r--xc/programs/Xserver/PEX5/include/PEX.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/PEXErr.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/PEXfuncs.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/PEXmacs.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/PEXproto.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/PEXprotost.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/ddpex.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/ddpex3.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/ddpex4.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/dipex.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/pexError.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/pexExtract.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/pexLookup.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/pexSwap.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/pexUtils.h2
-rw-r--r--xc/programs/Xserver/PEX5/include/pex_site.h2
-rw-r--r--xc/programs/Xserver/PEX5/ospex/Imakefile2
-rw-r--r--xc/programs/Xserver/PEX5/ospex/osPexFont.c2
-rw-r--r--xc/programs/Xserver/XIE/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/dixie/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/echist.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/eclut.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/ecphoto.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/ecroi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/edraw.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/edrawp.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/elut.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/ephoto.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/export/eroi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/iclut.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/icphoto.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/icroi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/idraw.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/idrawp.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/ilut.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/iphoto.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/import/iroi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/parith.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pbandc.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pbande.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pbands.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pblend.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pcfrgb.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pcfromi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pcnst.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pcomp.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pconv.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pctoi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pctrgb.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pdither.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pgeom.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/phist.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/plogic.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/pmath.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/ppaste.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/ppoint.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/process/puncnst.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/colorlst.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/difloat.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/error.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/event.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/flo.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/lut.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/memory.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/photomap.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/protoflo.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/roi.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/session.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/tables.c2
-rw-r--r--xc/programs/Xserver/XIE/dixie/request/technq.c2
-rw-r--r--xc/programs/Xserver/XIE/include/colorlst.h2
-rw-r--r--xc/programs/Xserver/XIE/include/corex.h2
-rw-r--r--xc/programs/Xserver/XIE/include/difloat.h2
-rw-r--r--xc/programs/Xserver/XIE/include/element.h2
-rw-r--r--xc/programs/Xserver/XIE/include/error.h2
-rw-r--r--xc/programs/Xserver/XIE/include/flo.h2
-rw-r--r--xc/programs/Xserver/XIE/include/flodata.h2
-rw-r--r--xc/programs/Xserver/XIE/include/flostr.h2
-rw-r--r--xc/programs/Xserver/XIE/include/lut.h2
-rw-r--r--xc/programs/Xserver/XIE/include/macro.h2
-rw-r--r--xc/programs/Xserver/XIE/include/memory.h2
-rw-r--r--xc/programs/Xserver/XIE/include/photomap.h2
-rw-r--r--xc/programs/Xserver/XIE/include/photospc.h2
-rw-r--r--xc/programs/Xserver/XIE/include/roi.h2
-rw-r--r--xc/programs/Xserver/XIE/include/tables.h2
-rw-r--r--xc/programs/Xserver/XIE/include/technq.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/control/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/control/analyze.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/control/domain.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/control/floman.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/control/sched.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/control/strip.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/mechist.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/meclut.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/mecphoto.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/mecroi.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/medraw.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/medrawp.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/mefax.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/mejpeg.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/melut.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/mephoto.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/meroi.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/meuncomp.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/export/schoice.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/bits.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/dg31d.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/dg32d.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/dg4.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/dtiff2.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/dtiffpb.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/eg31d.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/eg32d.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/etiff2.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/etiffpb.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/faxint.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/faxtabs.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/faxtabs.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/fencode.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/fetabs.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/gbits.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/fax/zeroeven.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/miclut.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/micphoto.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/microi.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/midraw.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/mifax.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/mijpeg.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/milut.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/miphoto.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/miregion.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/miroi.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/import/miuncomp.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/domain.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/fax.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/floman.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/jpeg.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/jpegd.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/jpege.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/meuncomp.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/microi.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/miphoto.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/miuncomp.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/mpgeom.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/mppoint.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/sched.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/strip.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/tex.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/texstr.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/include/xiemd.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/README2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jcexpand.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jchuff.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jcmcu.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jcsample.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jcxie.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jcxief.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jddeflts.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdhuff.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdmcu.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdsample.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdxie.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jdxief.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jelossy.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jfwddct.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jpegdata.h2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jrevdct.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jutils.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/Imakefile2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/bitfun.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mparith.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpbandc.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpbande.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpbands.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpblend.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpcfromi.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpcnst.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpcomp.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpconv.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpctoi.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpdither.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpgeom.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mphist.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mplogic.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mppaste.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mppoint.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mprgb.c2
-rw-r--r--xc/programs/Xserver/XIE/mixie/process/mpuncnst.c2
-rw-r--r--xc/programs/Xserver/Xext/Imakefile2
-rw-r--r--xc/programs/Xserver/Xext/bigreq.c2
-rw-r--r--xc/programs/Xserver/Xext/mbuf.c2
-rw-r--r--xc/programs/Xserver/Xext/mbufbf.c2
-rw-r--r--xc/programs/Xserver/Xext/mbufpx.c2
-rw-r--r--xc/programs/Xserver/Xext/mitmisc.c2
-rw-r--r--xc/programs/Xserver/Xext/shape.c2
-rw-r--r--xc/programs/Xserver/Xext/shm.c2
-rw-r--r--xc/programs/Xserver/Xext/sleepuntil.c2
-rw-r--r--xc/programs/Xserver/Xext/sync.c2
-rw-r--r--xc/programs/Xserver/Xext/xcmisc.c2
-rw-r--r--xc/programs/Xserver/Xext/xtest.c2
-rw-r--r--xc/programs/Xserver/Xext/xtest1dd.c2
-rw-r--r--xc/programs/Xserver/Xext/xtest1di.c2
-rw-r--r--xc/programs/Xserver/Xi/Imakefile2
-rw-r--r--xc/programs/Xserver/Xi/allowev.c2
-rw-r--r--xc/programs/Xserver/Xi/chgdctl.c2
-rw-r--r--xc/programs/Xserver/Xi/chgfctl.c2
-rw-r--r--xc/programs/Xserver/Xi/chgkbd.c2
-rw-r--r--xc/programs/Xserver/Xi/chgkmap.c2
-rw-r--r--xc/programs/Xserver/Xi/chgprop.c2
-rw-r--r--xc/programs/Xserver/Xi/chgptr.c2
-rw-r--r--xc/programs/Xserver/Xi/closedev.c2
-rw-r--r--xc/programs/Xserver/Xi/devbell.c2
-rw-r--r--xc/programs/Xserver/Xi/exevents.c2
-rw-r--r--xc/programs/Xserver/Xi/extinit.c2
-rw-r--r--xc/programs/Xserver/Xi/getbmap.c2
-rw-r--r--xc/programs/Xserver/Xi/getdctl.c2
-rw-r--r--xc/programs/Xserver/Xi/getfctl.c2
-rw-r--r--xc/programs/Xserver/Xi/getfocus.c2
-rw-r--r--xc/programs/Xserver/Xi/getkmap.c2
-rw-r--r--xc/programs/Xserver/Xi/getmmap.c2
-rw-r--r--xc/programs/Xserver/Xi/getprop.c2
-rw-r--r--xc/programs/Xserver/Xi/getselev.c2
-rw-r--r--xc/programs/Xserver/Xi/getvers.c2
-rw-r--r--xc/programs/Xserver/Xi/grabdev.c2
-rw-r--r--xc/programs/Xserver/Xi/grabdevb.c2
-rw-r--r--xc/programs/Xserver/Xi/grabdevk.c2
-rw-r--r--xc/programs/Xserver/Xi/gtmotion.c2
-rw-r--r--xc/programs/Xserver/Xi/listdev.c2
-rw-r--r--xc/programs/Xserver/Xi/opendev.c2
-rw-r--r--xc/programs/Xserver/Xi/queryst.c2
-rw-r--r--xc/programs/Xserver/Xi/selectev.c2
-rw-r--r--xc/programs/Xserver/Xi/sendexev.c2
-rw-r--r--xc/programs/Xserver/Xi/setbmap.c2
-rw-r--r--xc/programs/Xserver/Xi/setdval.c2
-rw-r--r--xc/programs/Xserver/Xi/setfocus.c2
-rw-r--r--xc/programs/Xserver/Xi/setmmap.c2
-rw-r--r--xc/programs/Xserver/Xi/setmode.c2
-rw-r--r--xc/programs/Xserver/Xi/stubs.c2
-rw-r--r--xc/programs/Xserver/Xi/ungrdev.c2
-rw-r--r--xc/programs/Xserver/Xi/ungrdevb.c2
-rw-r--r--xc/programs/Xserver/Xi/ungrdevk.c2
-rw-r--r--xc/programs/Xserver/Xserver.man2
-rw-r--r--xc/programs/Xserver/cfb/Imakefile2
-rw-r--r--xc/programs/Xserver/cfb/cfb.h2
-rw-r--r--xc/programs/Xserver/cfb/cfb8bit.c2
-rw-r--r--xc/programs/Xserver/cfb/cfb8bit.h2
-rw-r--r--xc/programs/Xserver/cfb/cfb8cppl.c2
-rw-r--r--xc/programs/Xserver/cfb/cfb8line.c2
-rw-r--r--xc/programs/Xserver/cfb/cfballpriv.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbbitblt.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbblt.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbbres.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbbresd.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbbstore.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbcmap.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbfillarc.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbfillrct.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbfillsp.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbgc.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbgetsp.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbglblt8.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbhrzvert.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbigblt8.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbimage.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbline.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbmap.h2
-rw-r--r--xc/programs/Xserver/cfb/cfbmskbits.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbmskbits.h2
-rw-r--r--xc/programs/Xserver/cfb/cfbpixmap.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbply1rct.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbpntwin.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbpolypnt.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbpush8.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbrctstp8.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbrrop.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbrrop.h2
-rw-r--r--xc/programs/Xserver/cfb/cfbscrinit.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbsetsp.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbsolid.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbteblt8.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbtegblt.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbtile32.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbtileodd.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbwindow.c2
-rw-r--r--xc/programs/Xserver/cfb/cfbzerarc.c2
-rw-r--r--xc/programs/Xserver/cfb/stip68kgnu.h2
-rw-r--r--xc/programs/Xserver/cfb/stipmips.s2
-rw-r--r--xc/programs/Xserver/cfb/stipple68k.s2
-rw-r--r--xc/programs/Xserver/cfb/stipsparc.s2
-rw-r--r--xc/programs/Xserver/cfb/stipsprc32.s2
-rw-r--r--xc/programs/Xserver/cfb16/Imakefile2
-rw-r--r--xc/programs/Xserver/cfb32/Imakefile2
-rw-r--r--xc/programs/Xserver/dbe/Imakefile2
-rw-r--r--xc/programs/Xserver/dbe/dbe.c4
-rw-r--r--xc/programs/Xserver/dbe/dbestruct.h4
-rw-r--r--xc/programs/Xserver/dbe/midbe.c4
-rw-r--r--xc/programs/Xserver/dbe/midbe.h4
-rw-r--r--xc/programs/Xserver/dbe/midbestruct.h4
-rw-r--r--xc/programs/Xserver/dix/Imakefile2
-rw-r--r--xc/programs/Xserver/dix/atom.c2
-rw-r--r--xc/programs/Xserver/dix/colormap.c2
-rw-r--r--xc/programs/Xserver/dix/cursor.c2
-rw-r--r--xc/programs/Xserver/dix/devices.c2
-rw-r--r--xc/programs/Xserver/dix/dispatch.c2
-rw-r--r--xc/programs/Xserver/dix/dixfonts.c2
-rw-r--r--xc/programs/Xserver/dix/dixutils.c2
-rw-r--r--xc/programs/Xserver/dix/events.c2
-rw-r--r--xc/programs/Xserver/dix/extension.c2
-rw-r--r--xc/programs/Xserver/dix/gc.c2
-rw-r--r--xc/programs/Xserver/dix/globals.c2
-rw-r--r--xc/programs/Xserver/dix/glyphcurs.c2
-rw-r--r--xc/programs/Xserver/dix/grabs.c2
-rw-r--r--xc/programs/Xserver/dix/main.c2
-rw-r--r--xc/programs/Xserver/dix/pixmap.c2
-rw-r--r--xc/programs/Xserver/dix/privates.c2
-rw-r--r--xc/programs/Xserver/dix/property.c2
-rw-r--r--xc/programs/Xserver/dix/resource.c2
-rw-r--r--xc/programs/Xserver/dix/swaprep.c2
-rw-r--r--xc/programs/Xserver/dix/swapreq.c2
-rw-r--r--xc/programs/Xserver/dix/tables.c2
-rw-r--r--xc/programs/Xserver/dix/window.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/Xdec.man2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/acc_2da.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/acc_3d.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/acc_none.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/cfbinit.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/ext_device.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/init.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/keynames.h2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/mdepthinit.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/ws.h2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/ws_color.c2
-rw-r--r--xc/programs/Xserver/hw/dec/ws/ws_io.c2
-rw-r--r--xc/programs/Xserver/hw/hp/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/hp/Xhp.man2
-rw-r--r--xc/programs/Xserver/hw/hp/ddx_info.c2
-rw-r--r--xc/programs/Xserver/hw/hp/hpCursorUtils.c2
-rw-r--r--xc/programs/Xserver/hw/hp/hpInit.c2
-rw-r--r--xc/programs/Xserver/hw/hp/include/XHPproto.h2
-rw-r--r--xc/programs/Xserver/hw/hp/include/hppriv.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/hp/input/X11/HPkeysym.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/X11/XHPlib.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/cr16.s2
-rw-r--r--xc/programs/Xserver/hw/hp/input/drivers/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/hp/input/drivers/X0screens2
-rw-r--r--xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/drivers/hp7lc2k.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/drivers/hp7lc2m.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/drivers/ps2io.h4
-rw-r--r--xc/programs/Xserver/hw/hp/input/get_tv.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/getkeysym.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/hildef.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/hpKeyMap.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/hpext.h4
-rw-r--r--xc/programs/Xserver/hw/hp/input/hpkeys.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/screentab.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/x_hil.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/x_hil.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/x_hilinit.c2
-rw-r--r--xc/programs/Xserver/hw/hp/input/x_hilinit.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/x_serialdrv.h2
-rw-r--r--xc/programs/Xserver/hw/hp/input/xtest1imp.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/dregs.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/hyperScrn.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/ngle.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/ngleblt.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglecolormap.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglecolormap.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglecopy.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglecopy.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglecursor.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglecursor.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/ngledevrom.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/ngleextern.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglehdw.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglenoop.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglenoop.h2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglescreen.c2
-rw-r--r--xc/programs/Xserver/hw/hp/ngle/nglescreen.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/AIX.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/AIXV3.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/AIXext.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/AIXinit.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/OScursor.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/OSio.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/X_msg.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixCursor.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixCursor.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixDebug.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixError.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixError.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixEvents.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixInput.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixKeybd.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixKeymap.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixMouse.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixMsg.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/aixWrap.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/hftQueue.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/hftQueue.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/hftUtils.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/AIX/hftUtils.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/OScompiler.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/compiler.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmColor.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmColor.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmDate.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmIO.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmIO.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmInit.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmInit.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmKeybd.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmKeybd.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmMalloc.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmMalloc.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmMouse.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmMouse.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmPlumber.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmQuery.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmSave.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmScreen.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmScreen.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmTrace.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/common/ibmUtils.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgc.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgcCmap.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgcCpArea.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgcGlobal.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgcPntWin.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgcProcs.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/pgc/pgcWindow.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/copyword.s2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyBitBlt.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyCmap.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyCur.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyFill.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyFillRct.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyHdwr.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyHdwr.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyInfo.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyPriv.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyProbe.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyProcs.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyReg.h2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skySGC.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skySave.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyScrInit.c2
-rw-r--r--xc/programs/Xserver/hw/ibm/skyway/skyWin.c2
-rw-r--r--xc/programs/Xserver/hw/macII/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/macII/XmacII.man2
-rw-r--r--xc/programs/Xserver/hw/macII/macII.h2
-rw-r--r--xc/programs/Xserver/hw/macII/macIIKbd.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omron.h2
-rw-r--r--xc/programs/Xserver/hw/omron/omron88kBm.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronDtBm.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronFb.h2
-rw-r--r--xc/programs/Xserver/hw/omron/omronFsBm.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronInit.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronIo.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronKMap.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronKbd.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronKbd.h2
-rw-r--r--xc/programs/Xserver/hw/omron/omronMouse.c2
-rw-r--r--xc/programs/Xserver/hw/omron/omronMouse.h2
-rw-r--r--xc/programs/Xserver/hw/omron/omronUtils.c2
-rw-r--r--xc/programs/Xserver/hw/sun/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/sun/Xsun.man2
-rw-r--r--xc/programs/Xserver/hw/sun/constype.c2
-rw-r--r--xc/programs/Xserver/hw/sun/constype.man2
-rw-r--r--xc/programs/Xserver/hw/sun/kbd_mode.c2
-rw-r--r--xc/programs/Xserver/hw/sun/kbd_mode.man2
-rw-r--r--xc/programs/Xserver/hw/sun/sun.h2
-rw-r--r--xc/programs/Xserver/hw/sun/sunCfb.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunCfb24.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunCursor.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunFbs.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunGX.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunGX.h2
-rw-r--r--xc/programs/Xserver/hw/sun/sunInit.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunIo.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunKbd.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunKeyMap.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunMfb.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunMouse.c2
-rw-r--r--xc/programs/Xserver/hw/sun/sunMultiDepth.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sun.h2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunAmInit.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunAmIo.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunAmKbd.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunAmMouse.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunAmProbe.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunAmScreen.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunCfb.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunCursor.c2
-rw-r--r--xc/programs/Xserver/hw/sunAmoeba/sunFbs.c2
-rw-r--r--xc/programs/Xserver/hw/svga/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/svga/atKeynames.h2
-rw-r--r--xc/programs/Xserver/hw/svga/compiler.h2
-rw-r--r--xc/programs/Xserver/hw/svga/config/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/svga/config/vga.pmi2
-rw-r--r--xc/programs/Xserver/hw/svga/svga.h2
-rw-r--r--xc/programs/Xserver/hw/svga/svga386.s2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaBank.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaColor.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaFb.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaInit.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaIo.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaKbd.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaSVPMI.c2
-rw-r--r--xc/programs/Xserver/hw/svga/svgaVT.c2
-rw-r--r--xc/programs/Xserver/hw/vfb/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/vfb/InitInput.c2
-rw-r--r--xc/programs/Xserver/hw/vfb/InitOutput.c2
-rw-r--r--xc/programs/Xserver/hw/vfb/Xvfb.man2
-rw-r--r--xc/programs/Xserver/hw/vfb/lk201kbd.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/SuperProbe/I128.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/XF86_Acc.man2
-rw-r--r--xc/programs/Xserver/hw/xfree86/XF86_Mono.man2
-rw-r--r--xc/programs/Xserver/hw/xfree86/XF86_SVGA.man2
-rw-r--r--xc/programs/Xserver/hw/xfree86/XF86_VGA16.man2
-rw-r--r--xc/programs/Xserver/hw/xfree86/XFree86.man2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32line.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514im.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/bcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/bstor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/cmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsline.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsseg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/font.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/gs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/imfill.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/imread.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/imstip.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/imwrite.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/plypt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/reg8514.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/seg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/ss.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/text.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bstor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dsln.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dssg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8font.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imfl.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imrd.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imst.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imwrt.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8plypt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8ss.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/mach8/regmach8.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/confS3.sh2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3Bt485.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3im.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/Mach32.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/Mach64.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/Mach8.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/XF86_8514.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/XF86_S3.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/atKeynames.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/coKeynames.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/compiler.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Config.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Events.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Lock.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Priv.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Procs.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86_Config.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86_Option.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86_Option.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/ATTDac.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/I2061Acal.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/I2061Aset.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/ICD2061A.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/SC11412.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/Japanese/README2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/README.Oak2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/README.isc2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml2
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/2key.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/install.sv32
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/install.sv42
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/sun.tcap2
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/sun.tinfo2
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch2
-rw-r--r--xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch2
-rw-r--r--xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/assyntax.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/mach/mach_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/IO_utils.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/std_mseEv.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_iout.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_mmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/confvga16.sh2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ibmTrace.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbfillarc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbimggblt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbzerarc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppc.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArc.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitMacs.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCReduce.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcClip.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCurs.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcDepth.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcFillRct.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGCstr.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyRec.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcProcs.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcQuery.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRot.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcScrn.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSinTab.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSpMcro.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaData.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaIO.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaOSD.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaProcs.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaReg.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSave.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/wm0.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/mi/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/configvga2.sh2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/confvga256.sh2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/ati_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/bank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/fBitBlt.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBBlt2.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBitBlt.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBox.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/suLine.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/suVHLine.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86Version.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86config/Cards2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86config/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86config/cards.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86config/cards.h2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man2
-rw-r--r--xc/programs/Xserver/hw/xnest/Args.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Args.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Color.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Color.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Cursor.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Cursor.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Display.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Display.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Drawable.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Events.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Events.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Font.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Font.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/GC.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/GC.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/GCOps.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/GCOps.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/GetTime.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Handlers.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Handlers.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Imakefile2
-rw-r--r--xc/programs/Xserver/hw/xnest/Init.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Init.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Keyboard.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Keyboard.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Pixmap.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Pixmap.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Pointer.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Pointer.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Screen.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Screen.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/TestExt.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Visual.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Visual.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Window.c2
-rw-r--r--xc/programs/Xserver/hw/xnest/Window.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Xnest.h2
-rw-r--r--xc/programs/Xserver/hw/xnest/Xnest.man2
-rw-r--r--xc/programs/Xserver/include/Imakefile2
-rw-r--r--xc/programs/Xserver/include/POQ.h310
-rw-r--r--xc/programs/Xserver/include/cit.h156
-rw-r--r--xc/programs/Xserver/include/closestr.h2
-rw-r--r--xc/programs/Xserver/include/closure.h2
-rw-r--r--xc/programs/Xserver/include/colormap.h2
-rw-r--r--xc/programs/Xserver/include/colormapst.h2
-rw-r--r--xc/programs/Xserver/include/conflict.h298
-rw-r--r--xc/programs/Xserver/include/cursor.h2
-rw-r--r--xc/programs/Xserver/include/cursorstr.h2
-rw-r--r--xc/programs/Xserver/include/dix.h2
-rw-r--r--xc/programs/Xserver/include/dixfont.h2
-rw-r--r--xc/programs/Xserver/include/dixfontstr.h2
-rw-r--r--xc/programs/Xserver/include/dixstruct.h2
-rw-r--r--xc/programs/Xserver/include/extension.h2
-rw-r--r--xc/programs/Xserver/include/extnsionst.h2
-rw-r--r--xc/programs/Xserver/include/gc.h2
-rw-r--r--xc/programs/Xserver/include/gcstruct.h2
-rw-r--r--xc/programs/Xserver/include/input.h2
-rw-r--r--xc/programs/Xserver/include/inputstr.h2
-rw-r--r--xc/programs/Xserver/include/message.h176
-rw-r--r--xc/programs/Xserver/include/misc.h2
-rw-r--r--xc/programs/Xserver/include/miscstruct.h2
-rw-r--r--xc/programs/Xserver/include/mtxlock.h1045
-rw-r--r--xc/programs/Xserver/include/opaque.h2
-rw-r--r--xc/programs/Xserver/include/os.h2
-rw-r--r--xc/programs/Xserver/include/pixmap.h2
-rw-r--r--xc/programs/Xserver/include/pixmapstr.h2
-rw-r--r--xc/programs/Xserver/include/property.h2
-rw-r--r--xc/programs/Xserver/include/propertyst.h2
-rw-r--r--xc/programs/Xserver/include/pthread.h53
-rw-r--r--xc/programs/Xserver/include/region.h2
-rw-r--r--xc/programs/Xserver/include/regionstr.h2
-rw-r--r--xc/programs/Xserver/include/resource.h2
-rw-r--r--xc/programs/Xserver/include/rgb.h2
-rw-r--r--xc/programs/Xserver/include/screenint.h2
-rw-r--r--xc/programs/Xserver/include/scrnintstr.h2
-rw-r--r--xc/programs/Xserver/include/selection.h2
-rw-r--r--xc/programs/Xserver/include/servermd.h2
-rw-r--r--xc/programs/Xserver/include/site.h2
-rw-r--r--xc/programs/Xserver/include/validate.h2
-rw-r--r--xc/programs/Xserver/include/window.h2
-rw-r--r--xc/programs/Xserver/include/windowstr.h2
-rw-r--r--xc/programs/Xserver/include/xthreads.h204
-rw-r--r--xc/programs/Xserver/mfb/Imakefile2
-rw-r--r--xc/programs/Xserver/mfb/fastblt.h2
-rw-r--r--xc/programs/Xserver/mfb/maskbits.c2
-rw-r--r--xc/programs/Xserver/mfb/maskbits.h2
-rw-r--r--xc/programs/Xserver/mfb/mergerop.h2
-rw-r--r--xc/programs/Xserver/mfb/mfb.h2
-rw-r--r--xc/programs/Xserver/mfb/mfbbitblt.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbblt.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbbres.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbbresd.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbbstore.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbclip.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbcmap.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbfillarc.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbfillrct.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbfillsp.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbfont.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbgc.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbgetsp.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbhrzvert.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbimage.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbimggblt.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbline.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbmisc.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbpixmap.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbply1rct.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbplygblt.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbpntarea.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbpntwin.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbpolypnt.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbpushpxl.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbscrclse.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbscrinit.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbsetsp.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbtegblt.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbtile.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbwindow.c2
-rw-r--r--xc/programs/Xserver/mfb/mfbzerarc.c2
-rw-r--r--xc/programs/Xserver/mi/Imakefile2
-rw-r--r--xc/programs/Xserver/mi/cbrt.c2
-rw-r--r--xc/programs/Xserver/mi/mi.h2
-rw-r--r--xc/programs/Xserver/mi/miarc.c2
-rw-r--r--xc/programs/Xserver/mi/mibitblt.c2
-rw-r--r--xc/programs/Xserver/mi/mibstore.c2
-rw-r--r--xc/programs/Xserver/mi/mibstore.h2
-rw-r--r--xc/programs/Xserver/mi/mibstorest.h2
-rw-r--r--xc/programs/Xserver/mi/miclipn.c2
-rw-r--r--xc/programs/Xserver/mi/micursor.c2
-rw-r--r--xc/programs/Xserver/mi/midash.c2
-rw-r--r--xc/programs/Xserver/mi/midispcur.c2
-rw-r--r--xc/programs/Xserver/mi/mieq.c2
-rw-r--r--xc/programs/Xserver/mi/miexpose.c2
-rw-r--r--xc/programs/Xserver/mi/mifillarc.c2
-rw-r--r--xc/programs/Xserver/mi/mifillarc.h2
-rw-r--r--xc/programs/Xserver/mi/mifillrct.c2
-rw-r--r--xc/programs/Xserver/mi/mifpoly.h2
-rw-r--r--xc/programs/Xserver/mi/mifpolycon.c2
-rw-r--r--xc/programs/Xserver/mi/migc.c2
-rw-r--r--xc/programs/Xserver/mi/migc.h2
-rw-r--r--xc/programs/Xserver/mi/miglblt.c2
-rw-r--r--xc/programs/Xserver/mi/miinitext.c2
-rw-r--r--xc/programs/Xserver/mi/miline.h2
-rw-r--r--xc/programs/Xserver/mi/mipointer.c2
-rw-r--r--xc/programs/Xserver/mi/mipointer.h2
-rw-r--r--xc/programs/Xserver/mi/mipointrst.h2
-rw-r--r--xc/programs/Xserver/mi/mipoly.c2
-rw-r--r--xc/programs/Xserver/mi/mipoly.h2
-rw-r--r--xc/programs/Xserver/mi/mipolycon.c2
-rw-r--r--xc/programs/Xserver/mi/mipolygen.c2
-rw-r--r--xc/programs/Xserver/mi/mipolypnt.c2
-rw-r--r--xc/programs/Xserver/mi/mipolyrect.c2
-rw-r--r--xc/programs/Xserver/mi/mipolyseg.c2
-rw-r--r--xc/programs/Xserver/mi/mipolytext.c2
-rw-r--r--xc/programs/Xserver/mi/mipolyutil.c2
-rw-r--r--xc/programs/Xserver/mi/mipushpxl.c2
-rw-r--r--xc/programs/Xserver/mi/miregion.c2
-rw-r--r--xc/programs/Xserver/mi/miscanfill.h2
-rw-r--r--xc/programs/Xserver/mi/miscrinit.c2
-rw-r--r--xc/programs/Xserver/mi/mispans.c2
-rw-r--r--xc/programs/Xserver/mi/mispans.h2
-rw-r--r--xc/programs/Xserver/mi/misprite.c2
-rw-r--r--xc/programs/Xserver/mi/misprite.h2
-rw-r--r--xc/programs/Xserver/mi/mispritest.h2
-rw-r--r--xc/programs/Xserver/mi/mistruct.h2
-rw-r--r--xc/programs/Xserver/mi/mivalidate.h2
-rw-r--r--xc/programs/Xserver/mi/mivaltree.c2
-rw-r--r--xc/programs/Xserver/mi/miwideline.c2
-rw-r--r--xc/programs/Xserver/mi/miwideline.h2
-rw-r--r--xc/programs/Xserver/mi/miwindow.c2
-rw-r--r--xc/programs/Xserver/mi/mizerarc.c2
-rw-r--r--xc/programs/Xserver/mi/mizerarc.h2
-rw-r--r--xc/programs/Xserver/mi/mizerline.c2
-rw-r--r--xc/programs/Xserver/os/Imakefile2
-rw-r--r--xc/programs/Xserver/os/WaitFor.c2
-rw-r--r--xc/programs/Xserver/os/access.c2
-rw-r--r--xc/programs/Xserver/os/auth.c2
-rw-r--r--xc/programs/Xserver/os/connection.c2
-rw-r--r--xc/programs/Xserver/os/decompress.c2
-rw-r--r--xc/programs/Xserver/os/hpsocket.c2
-rw-r--r--xc/programs/Xserver/os/io.c2
-rw-r--r--xc/programs/Xserver/os/iopreader.c2
-rw-r--r--xc/programs/Xserver/os/k5auth.c2
-rw-r--r--xc/programs/Xserver/os/lbxio.c2
-rw-r--r--xc/programs/Xserver/os/mitauth.c2
-rw-r--r--xc/programs/Xserver/os/oscolor.c2
-rw-r--r--xc/programs/Xserver/os/osdep.h2
-rw-r--r--xc/programs/Xserver/os/osinit.c2
-rw-r--r--xc/programs/Xserver/os/rpcauth.c2
-rw-r--r--xc/programs/Xserver/os/utils.c2
-rw-r--r--xc/programs/Xserver/os/xdmauth.c2
-rw-r--r--xc/programs/Xserver/os/xdmcp.c2
-rw-r--r--xc/programs/Xserver/xkb/Imakefile2
-rw-r--r--xc/programs/Xserver/xkb/xkb.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbAccessX.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbDflts.h2
-rw-r--r--xc/programs/Xserver/xkb/xkbEvents.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbInit.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbPrKeyEv.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbReadXkm.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbStubs.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbSwap.c2
-rw-r--r--xc/programs/Xserver/xkb/xkbUtils.c2
-rw-r--r--xc/programs/appres/Imakefile2
-rw-r--r--xc/programs/appres/appres.c2
-rw-r--r--xc/programs/appres/appres.man2
-rw-r--r--xc/programs/bdftopcf/Imakefile2
-rw-r--r--xc/programs/bdftopcf/bdftopcf.c2
-rw-r--r--xc/programs/bdftopcf/bdftopcf.man2
-rw-r--r--xc/programs/bitmap/BitEdit.c2
-rw-r--r--xc/programs/bitmap/Bitmap-co.ad2
-rw-r--r--xc/programs/bitmap/Bitmap.ad2
-rw-r--r--xc/programs/bitmap/Bitmap.c2
-rw-r--r--xc/programs/bitmap/Bitmap.h2
-rw-r--r--xc/programs/bitmap/BitmapP.h2
-rw-r--r--xc/programs/bitmap/CutPaste.c2
-rw-r--r--xc/programs/bitmap/Dialog.c2
-rw-r--r--xc/programs/bitmap/Dialog.h2
-rw-r--r--xc/programs/bitmap/Graphics.c2
-rw-r--r--xc/programs/bitmap/Handlers.c2
-rw-r--r--xc/programs/bitmap/Imakefile2
-rwxr-xr-xxc/programs/bitmap/RCS0
-rw-r--r--xc/programs/bitmap/ReqMach.c2
-rw-r--r--xc/programs/bitmap/Requests.h2
-rw-r--r--xc/programs/bitmap/atobm.c2
-rw-r--r--xc/programs/bitmap/bitmap.man2
-rw-r--r--xc/programs/bitmap/bmtoa.c2
-rw-r--r--xc/programs/editres/Edit-col.ad2
-rw-r--r--xc/programs/editres/Editres.ad2
-rw-r--r--[-rwxr-xr-x]xc/programs/editres/Imakefile2
-rw-r--r--xc/programs/editres/actions.c2
-rw-r--r--xc/programs/editres/comm.c2
-rw-r--r--xc/programs/editres/editres.c2
-rw-r--r--xc/programs/editres/editres.man2
-rw-r--r--xc/programs/editres/editresP.h2
-rw-r--r--xc/programs/editres/geometry.c2
-rw-r--r--xc/programs/editres/handler.c2
-rw-r--r--xc/programs/editres/setvalues.c2
-rw-r--r--xc/programs/editres/svpopup.c2
-rw-r--r--xc/programs/editres/utils.c2
-rw-r--r--xc/programs/editres/widgets.c2
-rw-r--r--xc/programs/editres/wtree.c2
-rw-r--r--xc/programs/fsinfo/Imakefile2
-rw-r--r--xc/programs/fsinfo/fsinfo.c2
-rw-r--r--xc/programs/fsinfo/fsinfo.man2
-rw-r--r--xc/programs/fslsfonts/Imakefile2
-rw-r--r--xc/programs/fslsfonts/fslsfonts.c2
-rw-r--r--xc/programs/fslsfonts/fslsfonts.man2
-rw-r--r--xc/programs/fstobdf/Imakefile2
-rw-r--r--xc/programs/fstobdf/chars.c2
-rw-r--r--xc/programs/fstobdf/fstobdf.c2
-rw-r--r--xc/programs/fstobdf/fstobdf.man2
-rw-r--r--xc/programs/fstobdf/header.c2
-rw-r--r--xc/programs/fstobdf/props.c2
-rw-r--r--xc/programs/iceauth/Imakefile2
-rw-r--r--xc/programs/iceauth/iceauth.c2
-rw-r--r--xc/programs/iceauth/iceauth.h2
-rw-r--r--xc/programs/iceauth/iceauth.man2
-rw-r--r--xc/programs/iceauth/process.c2
-rw-r--r--xc/programs/mkfontdir/Imakefile2
-rw-r--r--xc/programs/mkfontdir/mkfontdir.c2
-rw-r--r--xc/programs/mkfontdir/mkfontdir.man2
-rw-r--r--xc/programs/oclock/Clock-col.ad2
-rw-r--r--xc/programs/oclock/Clock.c2
-rw-r--r--xc/programs/oclock/Clock.h2
-rw-r--r--xc/programs/oclock/ClockP.h2
-rw-r--r--xc/programs/oclock/Imakefile2
-rw-r--r--xc/programs/oclock/oclock.c2
-rw-r--r--xc/programs/oclock/oclock.man2
-rw-r--r--xc/programs/oclock/transform.c2
-rw-r--r--xc/programs/oclock/transform.h2
-rw-r--r--xc/programs/rgb/Imakefile2
-rw-r--r--xc/programs/rgb/rgb.c2
-rw-r--r--xc/programs/rgb/rgb.txt2
-rw-r--r--xc/programs/rgb/showrgb.c2
-rw-r--r--xc/programs/rgb/showrgb.man2
-rw-r--r--xc/programs/rstart/Imakefile2
-rw-r--r--xc/programs/rstart/auth.c2
-rw-r--r--xc/programs/rstart/c2
-rw-r--r--xc/programs/rstart/client.cpp2
-rw-r--r--xc/programs/rstart/commands/@List2
-rwxr-xr-xxc/programs/rstart/commands/ListContexts2
-rwxr-xr-xxc/programs/rstart/commands/ListGenericCommands2
-rw-r--r--xc/programs/rstart/commands/x11r6/@List2
-rwxr-xr-xxc/programs/rstart/commands/x11r6/LoadMonitor2
-rwxr-xr-xxc/programs/rstart/commands/x11r6/Terminal2
-rw-r--r--xc/programs/rstart/config.cpp2
-rw-r--r--xc/programs/rstart/contexts/@Aliases2
-rw-r--r--xc/programs/rstart/contexts/@List2
-rw-r--r--xc/programs/rstart/contexts/default2
-rw-r--r--xc/programs/rstart/contexts/x11r62
-rw-r--r--xc/programs/rstart/rstart.man2
-rw-r--r--xc/programs/rstart/rstartd.man2
-rw-r--r--xc/programs/rstart/samples/commands/@List2
-rwxr-xr-xxc/programs/rstart/samples/commands/ListContexts2
-rwxr-xr-xxc/programs/rstart/samples/commands/ListGenericCommands2
-rw-r--r--xc/programs/rstart/samples/commands/odt1/@List2
-rwxr-xr-xxc/programs/rstart/samples/commands/odt1/LoadMonitor2
-rwxr-xr-xxc/programs/rstart/samples/commands/odt1/Terminal2
-rw-r--r--xc/programs/rstart/samples/commands/openwindows2/@List2
-rwxr-xr-xxc/programs/rstart/samples/commands/openwindows2/LoadMonitor2
-rwxr-xr-xxc/programs/rstart/samples/commands/openwindows2/Terminal2
-rw-r--r--xc/programs/rstart/samples/commands/openwindows3/@List2
-rwxr-xr-xxc/programs/rstart/samples/commands/openwindows3/LoadMonitor2
-rwxr-xr-xxc/programs/rstart/samples/commands/openwindows3/Terminal2
-rw-r--r--xc/programs/rstart/samples/commands/x11r5/@List2
-rwxr-xr-xxc/programs/rstart/samples/commands/x11r5/LoadMonitor2
-rwxr-xr-xxc/programs/rstart/samples/commands/x11r5/Terminal2
-rw-r--r--xc/programs/rstart/samples/contexts.odt1/@Aliases2
-rw-r--r--xc/programs/rstart/samples/contexts.odt1/@List2
-rw-r--r--xc/programs/rstart/samples/contexts.odt1/default2
-rw-r--r--xc/programs/rstart/samples/contexts.odt1/odt12
-rw-r--r--xc/programs/rstart/samples/contexts.sun/@Aliases2
-rw-r--r--xc/programs/rstart/samples/contexts.sun/@List2
-rw-r--r--xc/programs/rstart/samples/contexts.sun/default2
-rw-r--r--xc/programs/rstart/samples/contexts.sun/openwindows22
-rw-r--r--xc/programs/rstart/samples/contexts.sun/openwindows32
-rw-r--r--xc/programs/rstart/samples/contexts.sun/x11r52
-rw-r--r--xc/programs/rstart/samples/contexts.sun/x11r62
-rw-r--r--xc/programs/rstart/server.c2
-rwxr-xr-xxc/programs/rstart/server.cpp2
-rw-r--r--xc/programs/scripts/Imakefile2
-rw-r--r--xc/programs/scripts/xon.man2
-rwxr-xr-xxc/programs/scripts/xon.sh2
-rw-r--r--xc/programs/smproxy/Imakefile2
-rw-r--r--xc/programs/smproxy/save.c2
-rw-r--r--xc/programs/smproxy/smproxy.c2
-rw-r--r--xc/programs/smproxy/smproxy.h2
-rw-r--r--xc/programs/smproxy/smproxy.man2
-rw-r--r--xc/programs/twm/Imakefile2
-rw-r--r--xc/programs/twm/add_window.c2
-rw-r--r--xc/programs/twm/add_window.h2
-rw-r--r--xc/programs/twm/cursor.c2
-rw-r--r--xc/programs/twm/events.c2
-rw-r--r--xc/programs/twm/events.h2
-rw-r--r--xc/programs/twm/gc.c2
-rw-r--r--xc/programs/twm/gc.h2
-rw-r--r--xc/programs/twm/gram.y2
-rw-r--r--xc/programs/twm/iconmgr.c2
-rw-r--r--xc/programs/twm/iconmgr.h2
-rw-r--r--xc/programs/twm/icons.c2
-rw-r--r--xc/programs/twm/icons.h2
-rw-r--r--xc/programs/twm/lex.l2
-rw-r--r--xc/programs/twm/list.c2
-rw-r--r--xc/programs/twm/list.h2
-rw-r--r--xc/programs/twm/menus.c2
-rw-r--r--xc/programs/twm/menus.h2
-rw-r--r--xc/programs/twm/parse.c2
-rw-r--r--xc/programs/twm/parse.h2
-rw-r--r--xc/programs/twm/resize.c2
-rw-r--r--xc/programs/twm/resize.h2
-rw-r--r--xc/programs/twm/screen.h2
-rw-r--r--xc/programs/twm/session.c2
-rw-r--r--xc/programs/twm/system.twmrc2
-rw-r--r--xc/programs/twm/twm.c2
-rw-r--r--xc/programs/twm/twm.h2
-rw-r--r--xc/programs/twm/twm.man2
-rw-r--r--xc/programs/twm/util.c2
-rw-r--r--xc/programs/twm/util.h2
-rw-r--r--xc/programs/twm/version.c2
-rw-r--r--xc/programs/twm/version.h2
-rw-r--r--xc/programs/x11perf/Imakefile2
-rwxr-xr-xxc/programs/x11perf/Xmark.sh2
-rw-r--r--xc/programs/x11perf/bitmaps.c2
-rw-r--r--xc/programs/x11perf/bitmaps.h2
-rw-r--r--xc/programs/x11perf/do_arcs.c2
-rw-r--r--xc/programs/x11perf/do_blt.c2
-rw-r--r--xc/programs/x11perf/do_complex.c2
-rw-r--r--xc/programs/x11perf/do_dots.c2
-rw-r--r--xc/programs/x11perf/do_lines.c2
-rw-r--r--xc/programs/x11perf/do_movewin.c2
-rw-r--r--xc/programs/x11perf/do_rects.c2
-rw-r--r--xc/programs/x11perf/do_segs.c2
-rw-r--r--xc/programs/x11perf/do_simple.c2
-rw-r--r--xc/programs/x11perf/do_tests.c2
-rw-r--r--xc/programs/x11perf/do_text.c2
-rw-r--r--xc/programs/x11perf/do_traps.c2
-rw-r--r--xc/programs/x11perf/do_tris.c2
-rw-r--r--xc/programs/x11perf/do_valgc.c2
-rw-r--r--xc/programs/x11perf/do_windows.c2
-rw-r--r--xc/programs/x11perf/x11pcomp.cpp2
-rw-r--r--xc/programs/x11perf/x11pcomp.man2
-rw-r--r--xc/programs/x11perf/x11perf.c2
-rw-r--r--xc/programs/x11perf/x11perf.h2
-rw-r--r--xc/programs/x11perf/x11perf.man2
-rw-r--r--xc/programs/xauth/Imakefile2
-rw-r--r--xc/programs/xauth/gethost.c2
-rw-r--r--xc/programs/xauth/parsedpy.c2
-rw-r--r--xc/programs/xauth/process.c2
-rw-r--r--xc/programs/xauth/xauth.c2
-rw-r--r--xc/programs/xauth/xauth.h2
-rw-r--r--xc/programs/xauth/xauth.man2
-rw-r--r--xc/programs/xclipboard/Imakefile2
-rw-r--r--xc/programs/xclipboard/XClipboard.ad2
-rw-r--r--xc/programs/xclipboard/xclipboard.c2
-rw-r--r--xc/programs/xclipboard/xclipboard.man2
-rw-r--r--xc/programs/xclipboard/xcutsel.c2
-rw-r--r--xc/programs/xclipboard/xcutsel.man2
-rw-r--r--xc/programs/xclock/Clock.c2
-rw-r--r--xc/programs/xclock/Clock.h2
-rw-r--r--xc/programs/xclock/ClockP.h2
-rw-r--r--xc/programs/xclock/Imakefile2
-rw-r--r--xc/programs/xclock/xclock.c2
-rw-r--r--xc/programs/xclock/xclock.man2
-rw-r--r--xc/programs/xcmsdb/Imakefile2
-rw-r--r--xc/programs/xcmsdb/SCCDFile.h2
-rw-r--r--xc/programs/xcmsdb/loadData.c2
-rw-r--r--xc/programs/xcmsdb/xcmsdb.c2
-rw-r--r--xc/programs/xcmsdb/xcmsdb.man2
-rw-r--r--xc/programs/xconsole/Imakefile2
-rw-r--r--xc/programs/xconsole/XConsole.ad2
-rw-r--r--xc/programs/xconsole/xconsole.c2
-rw-r--r--xc/programs/xconsole/xconsole.man2
-rw-r--r--xc/programs/xdm/Imakefile2
-rw-r--r--xc/programs/xdm/access.c2
-rw-r--r--xc/programs/xdm/auth.c2
-rw-r--r--xc/programs/xdm/choose.c2
-rw-r--r--xc/programs/xdm/chooser.c2
-rwxr-xr-xxc/programs/xdm/config/GiveConsole2
-rw-r--r--xc/programs/xdm/config/Imakefile2
-rw-r--r--xc/programs/xdm/config/README2
-rwxr-xr-xxc/programs/xdm/config/TakeConsole2
-rw-r--r--xc/programs/xdm/config/Xaccess2
-rw-r--r--xc/programs/xdm/config/Xresources2
-rw-r--r--xc/programs/xdm/config/Xserv.ws.cpp2
-rw-r--r--xc/programs/xdm/config/Xservers.fs2
-rwxr-xr-xxc/programs/xdm/config/Xsession2
-rwxr-xr-xxc/programs/xdm/config/Xsetup_02
-rw-r--r--xc/programs/xdm/config/xdm-conf.cpp2
-rw-r--r--xc/programs/xdm/daemon.c2
-rw-r--r--xc/programs/xdm/dm.c2
-rw-r--r--xc/programs/xdm/dm.h2
-rw-r--r--xc/programs/xdm/dpylist.c2
-rw-r--r--xc/programs/xdm/error.c2
-rw-r--r--xc/programs/xdm/file.c2
-rw-r--r--xc/programs/xdm/genauth.c2
-rw-r--r--xc/programs/xdm/greet.h2
-rw-r--r--xc/programs/xdm/greeter/Imakefile2
-rw-r--r--xc/programs/xdm/greeter/Login.c2
-rw-r--r--xc/programs/xdm/greeter/Login.h2
-rw-r--r--xc/programs/xdm/greeter/LoginP.h2
-rw-r--r--xc/programs/xdm/greeter/greet.c2
-rw-r--r--xc/programs/xdm/greeter/verify.c2
-rw-r--r--xc/programs/xdm/krb5auth.c2
-rw-r--r--xc/programs/xdm/mitauth.c2
-rw-r--r--xc/programs/xdm/netaddr.c2
-rw-r--r--xc/programs/xdm/policy.c2
-rw-r--r--xc/programs/xdm/protodpy.c2
-rw-r--r--xc/programs/xdm/reset.c2
-rw-r--r--xc/programs/xdm/resource.c2
-rw-r--r--xc/programs/xdm/rpcauth.c2
-rw-r--r--xc/programs/xdm/server.c2
-rw-r--r--xc/programs/xdm/session.c2
-rw-r--r--xc/programs/xdm/sessreg.c2
-rw-r--r--xc/programs/xdm/sessreg.man2
-rw-r--r--xc/programs/xdm/socket.c2
-rw-r--r--xc/programs/xdm/streams.c2
-rw-r--r--xc/programs/xdm/util.c2
-rw-r--r--xc/programs/xdm/xdm.man2
-rw-r--r--xc/programs/xdm/xdmauth.c2
-rw-r--r--xc/programs/xdm/xdmcp.c2
-rw-r--r--xc/programs/xdm/xdmshell.c2
-rw-r--r--xc/programs/xdpyinfo/Imakefile2
-rw-r--r--xc/programs/xdpyinfo/xdpyinfo.c2
-rw-r--r--xc/programs/xdpyinfo/xdpyinfo.man2
-rw-r--r--xc/programs/xfd/Imakefile2
-rw-r--r--xc/programs/xfd/Xfd.ad2
-rw-r--r--xc/programs/xfd/grid.c2
-rw-r--r--xc/programs/xfd/grid.h2
-rw-r--r--xc/programs/xfd/gridP.h2
-rw-r--r--xc/programs/xfd/xfd.c2
-rw-r--r--xc/programs/xfd/xfd.man2
-rw-r--r--xc/programs/xfs/Imakefile2
-rw-r--r--xc/programs/xfs/config.cpp2
-rw-r--r--xc/programs/xfs/difs/Imakefile2
-rw-r--r--xc/programs/xfs/difs/atom.c2
-rw-r--r--xc/programs/xfs/difs/cache.c2
-rw-r--r--xc/programs/xfs/difs/charinfo.c2
-rw-r--r--xc/programs/xfs/difs/difsutils.c2
-rw-r--r--xc/programs/xfs/difs/dispatch.c2
-rw-r--r--xc/programs/xfs/difs/events.c2
-rw-r--r--xc/programs/xfs/difs/extensions.c2
-rw-r--r--xc/programs/xfs/difs/fontinfo.c2
-rw-r--r--xc/programs/xfs/difs/fonts.c2
-rw-r--r--xc/programs/xfs/difs/globals.c2
-rw-r--r--xc/programs/xfs/difs/initfonts.c2
-rw-r--r--xc/programs/xfs/difs/main.c2
-rw-r--r--xc/programs/xfs/difs/resource.c2
-rw-r--r--xc/programs/xfs/difs/swaprep.c2
-rw-r--r--xc/programs/xfs/difs/swapreq.c2
-rw-r--r--xc/programs/xfs/difs/tables.c2
-rw-r--r--xc/programs/xfs/include/access.h2
-rw-r--r--xc/programs/xfs/include/accstr.h2
-rw-r--r--xc/programs/xfs/include/assert.h2
-rw-r--r--xc/programs/xfs/include/auth.h2
-rw-r--r--xc/programs/xfs/include/authstr.h2
-rw-r--r--xc/programs/xfs/include/cache.h2
-rw-r--r--xc/programs/xfs/include/cachestr.h2
-rw-r--r--xc/programs/xfs/include/client.h2
-rw-r--r--xc/programs/xfs/include/clientstr.h2
-rw-r--r--xc/programs/xfs/include/closestr.h2
-rw-r--r--xc/programs/xfs/include/closure.h2
-rw-r--r--xc/programs/xfs/include/difsfn.h2
-rw-r--r--xc/programs/xfs/include/difsfnst.h2
-rw-r--r--xc/programs/xfs/include/events.h2
-rw-r--r--xc/programs/xfs/include/extentst.h2
-rw-r--r--xc/programs/xfs/include/globals.h2
-rw-r--r--xc/programs/xfs/include/misc.h2
-rw-r--r--xc/programs/xfs/include/os.h2
-rw-r--r--xc/programs/xfs/include/osstruct.h2
-rw-r--r--xc/programs/xfs/include/resource.h2
-rw-r--r--xc/programs/xfs/include/servermd.h2
-rw-r--r--xc/programs/xfs/include/site.h2
-rw-r--r--xc/programs/xfs/os/Imakefile2
-rw-r--r--xc/programs/xfs/os/access.c2
-rw-r--r--xc/programs/xfs/os/config.c2
-rw-r--r--xc/programs/xfs/os/config.h2
-rw-r--r--xc/programs/xfs/os/configstr.h2
-rw-r--r--xc/programs/xfs/os/connection.c2
-rw-r--r--xc/programs/xfs/os/error.c2
-rw-r--r--xc/programs/xfs/os/io.c2
-rw-r--r--xc/programs/xfs/os/osdep.h2
-rw-r--r--xc/programs/xfs/os/osglue.c2
-rw-r--r--xc/programs/xfs/os/osinit.c2
-rw-r--r--xc/programs/xfs/os/utils.c2
-rw-r--r--xc/programs/xfs/os/waitfor.c2
-rw-r--r--xc/programs/xfs/xfs.man2
-rw-r--r--xc/programs/xhost/Imakefile2
-rw-r--r--xc/programs/xhost/xhost.c2
-rw-r--r--xc/programs/xhost/xhost.man2
-rw-r--r--xc/programs/xieperf/Imakefile2
-rw-r--r--xc/programs/xieperf/abort.c2
-rw-r--r--xc/programs/xieperf/arith.c2
-rw-r--r--xc/programs/xieperf/await.c2
-rw-r--r--xc/programs/xieperf/band.c2
-rw-r--r--xc/programs/xieperf/blend.c2
-rw-r--r--xc/programs/xieperf/cache.c2
-rw-r--r--xc/programs/xieperf/compare.c2
-rw-r--r--xc/programs/xieperf/complex.c2
-rw-r--r--xc/programs/xieperf/constrain.c2
-rw-r--r--xc/programs/xieperf/convolve.c2
-rw-r--r--xc/programs/xieperf/creatdstry.c2
-rw-r--r--xc/programs/xieperf/cvttoindex.c2
-rw-r--r--xc/programs/xieperf/dither.c2
-rw-r--r--xc/programs/xieperf/encode.c2
-rw-r--r--xc/programs/xieperf/errors.c2
-rw-r--r--xc/programs/xieperf/events.c2
-rw-r--r--xc/programs/xieperf/exportcl.c2
-rw-r--r--xc/programs/xieperf/funcode.c2
-rw-r--r--xc/programs/xieperf/geometry.c2
-rw-r--r--xc/programs/xieperf/getnext.c2
-rw-r--r--xc/programs/xieperf/import.c2
-rw-r--r--xc/programs/xieperf/importcl.c2
-rw-r--r--xc/programs/xieperf/logical.c2
-rw-r--r--xc/programs/xieperf/math.c2
-rw-r--r--xc/programs/xieperf/modify.c2
-rw-r--r--xc/programs/xieperf/mtchhist.c2
-rw-r--r--xc/programs/xieperf/pasteup.c2
-rw-r--r--xc/programs/xieperf/point.c2
-rw-r--r--xc/programs/xieperf/purgecolst.c2
-rw-r--r--xc/programs/xieperf/query.c2
-rw-r--r--xc/programs/xieperf/redefine.c2
-rw-r--r--xc/programs/xieperf/rgb.c2
-rw-r--r--xc/programs/xieperf/tests.c2
-rw-r--r--xc/programs/xieperf/uconstrain.c2
-rw-r--r--xc/programs/xieperf/xieperf.c2
-rw-r--r--xc/programs/xieperf/xieperf.h2
-rw-r--r--xc/programs/xieperf/xieperf.man2
-rw-r--r--xc/programs/xinit/Imakefile2
-rw-r--r--xc/programs/xinit/startx.cpp2
-rw-r--r--xc/programs/xinit/startx.man2
-rw-r--r--xc/programs/xinit/xinit.c2
-rw-r--r--xc/programs/xinit/xinit.man2
-rw-r--r--xc/programs/xinit/xinitrc.cpp2
-rw-r--r--xc/programs/xkbcomp/Imakefile2
-rw-r--r--xc/programs/xkbcomp/action.c2
-rw-r--r--xc/programs/xkbcomp/action.h2
-rw-r--r--xc/programs/xkbcomp/compat.c2
-rw-r--r--xc/programs/xkbcomp/compat/basic2
-rw-r--r--xc/programs/xkbcomp/compat/complete2
-rw-r--r--xc/programs/xkbcomp/compat/default2
-rw-r--r--xc/programs/xkbcomp/compat/iso99952
-rw-r--r--xc/programs/xkbcomp/compat/misc2
-rw-r--r--xc/programs/xkbcomp/compat/mousekeys2
-rw-r--r--xc/programs/xkbcomp/cout.c618
-rw-r--r--xc/programs/xkbcomp/expr.c2
-rw-r--r--xc/programs/xkbcomp/expr.h2
-rw-r--r--xc/programs/xkbcomp/geometry/pc101-NG2
-rw-r--r--xc/programs/xkbcomp/indicators.c2
-rw-r--r--xc/programs/xkbcomp/indicators.h2
-rw-r--r--xc/programs/xkbcomp/keycodes.c2
-rw-r--r--xc/programs/xkbcomp/keycodes.h2
-rw-r--r--xc/programs/xkbcomp/keycodes/ibmpc2
-rw-r--r--xc/programs/xkbcomp/keycodes/sgi2
-rw-r--r--xc/programs/xkbcomp/keymap.c2
-rw-r--r--xc/programs/xkbcomp/keymap/us102_ibmpc2
-rw-r--r--xc/programs/xkbcomp/keymap/us102_sgi2
-rw-r--r--xc/programs/xkbcomp/keytypes.c2
-rw-r--r--xc/programs/xkbcomp/misc.c2
-rw-r--r--xc/programs/xkbcomp/misc.h2
-rw-r--r--xc/programs/xkbcomp/semantics/basic2
-rw-r--r--xc/programs/xkbcomp/semantics/complete2
-rw-r--r--xc/programs/xkbcomp/semantics/default2
-rw-r--r--xc/programs/xkbcomp/symbols.c2
-rw-r--r--xc/programs/xkbcomp/symbols/en_US2
-rw-r--r--xc/programs/xkbcomp/symbols/iso9995-32
-rw-r--r--xc/programs/xkbcomp/symbols/iso9995-full2
-rw-r--r--xc/programs/xkbcomp/symbols/us2
-rw-r--r--xc/programs/xkbcomp/tokens.h2
-rw-r--r--xc/programs/xkbcomp/types/basic2
-rw-r--r--xc/programs/xkbcomp/types/cancel2
-rw-r--r--xc/programs/xkbcomp/types/complete2
-rw-r--r--xc/programs/xkbcomp/types/default2
-rw-r--r--xc/programs/xkbcomp/types/ibmpc2
-rw-r--r--xc/programs/xkbcomp/types/iso99952
-rw-r--r--xc/programs/xkbcomp/utils/Imakefile2
-rw-r--r--xc/programs/xkbcomp/utils/hash.c2
-rw-r--r--xc/programs/xkbcomp/utils/hash.h2
-rw-r--r--xc/programs/xkbcomp/utils/hashstr.h2
-rw-r--r--xc/programs/xkbcomp/utils/storage.c2
-rw-r--r--xc/programs/xkbcomp/utils/storage.h2
-rw-r--r--xc/programs/xkbcomp/utils/storagestr.h2
-rw-r--r--xc/programs/xkbcomp/utils/strtbl.c2
-rw-r--r--xc/programs/xkbcomp/utils/strtbl.h2
-rw-r--r--xc/programs/xkbcomp/utils/strtblstr.h2
-rw-r--r--xc/programs/xkbcomp/utils/utils.c2
-rw-r--r--xc/programs/xkbcomp/utils/utils.h2
-rw-r--r--xc/programs/xkbcomp/vmod.c2
-rw-r--r--xc/programs/xkbcomp/vmod.h2
-rw-r--r--xc/programs/xkbcomp/xkbcomp.c2
-rw-r--r--xc/programs/xkbcomp/xkbcomp.h2
-rw-r--r--xc/programs/xkbcomp/xkbcomp.man2
-rw-r--r--xc/programs/xkbcomp/xkbfile/Imakefile2
-rw-r--r--xc/programs/xkbcomp/xkbfile/cout.c2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkbatom.c2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkbfile.h2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkbout.c2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkbpath.c2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkbtext.c2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkmout.c2
-rw-r--r--xc/programs/xkbcomp/xkbfile/xkmread.c2
-rw-r--r--xc/programs/xkbcomp/xkbio.c160
-rw-r--r--xc/programs/xkbcomp/xkbio.h57
-rw-r--r--xc/programs/xkbcomp/xkbout.c849
-rw-r--r--xc/programs/xkbcomp/xkbparse.h2
-rw-r--r--xc/programs/xkbcomp/xkbparse.y2
-rw-r--r--xc/programs/xkbcomp/xkbscan.c2
-rw-r--r--xc/programs/xkbcomp/xkmout.c695
-rw-r--r--xc/programs/xkill/Imakefile2
-rw-r--r--xc/programs/xkill/xkill.c2
-rw-r--r--xc/programs/xkill/xkill.man2
-rw-r--r--xc/programs/xlogo/Imakefile2
-rw-r--r--xc/programs/xlogo/Logo.c2
-rw-r--r--xc/programs/xlogo/LogoP.h2
-rw-r--r--xc/programs/xlogo/XLogo-co.ad2
-rw-r--r--xc/programs/xlogo/xlogo.c2
-rw-r--r--xc/programs/xlogo/xlogo.man2
-rw-r--r--xc/programs/xlsatoms/Imakefile2
-rw-r--r--xc/programs/xlsatoms/xlsatoms.c2
-rw-r--r--xc/programs/xlsatoms/xlsatoms.man2
-rw-r--r--xc/programs/xlsclients/Imakefile2
-rw-r--r--xc/programs/xlsclients/xlscli.man2
-rw-r--r--xc/programs/xlsclients/xlsclients.c2
-rw-r--r--xc/programs/xlsfonts/Imakefile2
-rw-r--r--xc/programs/xlsfonts/dsimple.c2
-rw-r--r--xc/programs/xlsfonts/dsimple.h2
-rw-r--r--xc/programs/xlsfonts/xlsfonts.c2
-rw-r--r--xc/programs/xlsfonts/xlsfonts.man2
-rw-r--r--xc/programs/xmag/CutPaste.c2
-rw-r--r--xc/programs/xmag/Imakefile2
-rw-r--r--xc/programs/xmag/RootWin.c2
-rw-r--r--xc/programs/xmag/RootWin.h2
-rw-r--r--xc/programs/xmag/RootWinP.h2
-rw-r--r--xc/programs/xmag/Scale.c2
-rw-r--r--xc/programs/xmag/Scale.h2
-rw-r--r--xc/programs/xmag/ScaleP.h2
-rw-r--r--xc/programs/xmag/Xmag.ad2
-rw-r--r--xc/programs/xmag/xmag.c2
-rw-r--r--xc/programs/xmag/xmag.man2
-rw-r--r--xc/programs/xmh/Imakefile2
-rw-r--r--xc/programs/xmh/Xmh.ad2
-rw-r--r--xc/programs/xmh/actions.h2
-rw-r--r--xc/programs/xmh/bbox.c2
-rw-r--r--xc/programs/xmh/bbox.h2
-rw-r--r--xc/programs/xmh/bboxint.h2
-rw-r--r--xc/programs/xmh/command.c2
-rw-r--r--xc/programs/xmh/compfuncs.c2
-rw-r--r--xc/programs/xmh/externs.h2
-rw-r--r--xc/programs/xmh/folder.c2
-rw-r--r--xc/programs/xmh/globals.h2
-rw-r--r--xc/programs/xmh/icon.c2
-rw-r--r--xc/programs/xmh/init.c2
-rw-r--r--xc/programs/xmh/main.c2
-rw-r--r--xc/programs/xmh/menu.c2
-rw-r--r--xc/programs/xmh/miscfuncs.c2
-rw-r--r--xc/programs/xmh/mlist.c2
-rw-r--r--xc/programs/xmh/mlist.h2
-rw-r--r--xc/programs/xmh/msg.h2
-rw-r--r--xc/programs/xmh/pick.c2
-rw-r--r--xc/programs/xmh/popup.c2
-rw-r--r--xc/programs/xmh/screen.c2
-rw-r--r--xc/programs/xmh/toc.c2
-rw-r--r--xc/programs/xmh/toc.h2
-rw-r--r--xc/programs/xmh/tocfuncs.c2
-rw-r--r--xc/programs/xmh/tocintrnl.h2
-rw-r--r--xc/programs/xmh/tocutil.c2
-rw-r--r--xc/programs/xmh/tocutil.h2
-rw-r--r--xc/programs/xmh/tsource.c2
-rw-r--r--xc/programs/xmh/tsource.h2
-rw-r--r--xc/programs/xmh/tsourceP.h2
-rw-r--r--xc/programs/xmh/util.c2
-rw-r--r--xc/programs/xmh/version.h2
-rw-r--r--xc/programs/xmh/viewfuncs.c2
-rw-r--r--xc/programs/xmh/xmh.h2
-rw-r--r--xc/programs/xmh/xmh.man2
-rw-r--r--xc/programs/xmodmap/Imakefile2
-rw-r--r--xc/programs/xmodmap/exec.c2
-rw-r--r--xc/programs/xmodmap/handle.c2
-rw-r--r--xc/programs/xmodmap/pf.c2
-rw-r--r--xc/programs/xmodmap/wq.h2
-rw-r--r--xc/programs/xmodmap/xmodmap.c2
-rw-r--r--xc/programs/xmodmap/xmodmap.h2
-rw-r--r--xc/programs/xmodmap/xmodmap.man2
-rw-r--r--xc/programs/xprop/Imakefile2
-rw-r--r--xc/programs/xprop/dsimple.c2
-rw-r--r--xc/programs/xprop/dsimple.h2
-rw-r--r--xc/programs/xprop/xprop.c2
-rw-r--r--xc/programs/xprop/xprop.man2
-rw-r--r--xc/programs/xrdb/Imakefile2
-rw-r--r--xc/programs/xrdb/xrdb.c2
-rw-r--r--xc/programs/xrdb/xrdb.man2
-rw-r--r--xc/programs/xrefresh/Imakefile2
-rw-r--r--xc/programs/xrefresh/xrefresh.c2
-rw-r--r--xc/programs/xrefresh/xrefresh.man2
-rw-r--r--xc/programs/xset/Imakefile2
-rw-r--r--xc/programs/xset/xset.c2
-rw-r--r--xc/programs/xset/xset.man2
-rw-r--r--xc/programs/xsetroot/Imakefile2
-rw-r--r--xc/programs/xsetroot/xsetroot.c2
-rw-r--r--xc/programs/xsetroot/xsetroot.man2
-rw-r--r--xc/programs/xstdcmap/Imakefile2
-rw-r--r--xc/programs/xstdcmap/xstdcmap.c2
-rw-r--r--xc/programs/xstdcmap/xstdcmap.man2
-rw-r--r--xc/programs/xterm/Imakefile2
-rw-r--r--xc/programs/xterm/TekPrsTbl.c2
-rw-r--r--xc/programs/xterm/Tekparse.def2
-rw-r--r--xc/programs/xterm/Tekparse.h2
-rw-r--r--xc/programs/xterm/Tekproc.c2
-rw-r--r--xc/programs/xterm/VTPrsTbl.c2
-rw-r--r--xc/programs/xterm/VTparse.def2
-rw-r--r--xc/programs/xterm/VTparse.h2
-rw-r--r--xc/programs/xterm/XTerm.ad2
-rw-r--r--xc/programs/xterm/button.c2
-rw-r--r--xc/programs/xterm/charproc.c2
-rw-r--r--xc/programs/xterm/cursor.c2
-rw-r--r--xc/programs/xterm/data.c2
-rw-r--r--xc/programs/xterm/data.h2
-rw-r--r--xc/programs/xterm/error.h2
-rw-r--r--xc/programs/xterm/input.c2
-rw-r--r--xc/programs/xterm/main.c2
-rw-r--r--xc/programs/xterm/main.h2
-rw-r--r--xc/programs/xterm/menu.c2
-rw-r--r--xc/programs/xterm/menu.h2
-rw-r--r--xc/programs/xterm/misc.c2
-rw-r--r--xc/programs/xterm/ptyx.h2
-rw-r--r--xc/programs/xterm/resize.c2
-rw-r--r--xc/programs/xterm/resize.man2
-rw-r--r--xc/programs/xterm/screen.c2
-rw-r--r--xc/programs/xterm/scrollbar.c2
-rw-r--r--xc/programs/xterm/tabs.c2
-rw-r--r--xc/programs/xterm/termcap2
-rw-r--r--xc/programs/xterm/terminfo2
-rw-r--r--xc/programs/xterm/util.c2
-rw-r--r--xc/programs/xterm/xterm.man2
-rw-r--r--xc/programs/xwd/Imakefile2
-rw-r--r--xc/programs/xwd/dsimple.c2
-rw-r--r--xc/programs/xwd/dsimple.h2
-rw-r--r--xc/programs/xwd/xwd.c2
-rw-r--r--xc/programs/xwd/xwd.man2
-rw-r--r--xc/programs/xwininfo/Imakefile2
-rw-r--r--xc/programs/xwininfo/dsimple.c2
-rw-r--r--xc/programs/xwininfo/dsimple.h2
-rw-r--r--xc/programs/xwininfo/xwininfo.c2
-rw-r--r--xc/programs/xwininfo/xwininfo.man2
-rw-r--r--xc/programs/xwud/Imakefile2
-rw-r--r--xc/programs/xwud/xwud.c2
-rw-r--r--xc/programs/xwud/xwud.man2
2027 files changed, 2020 insertions, 6643 deletions
diff --git a/xc/programs/Imakefile b/xc/programs/Imakefile
index 1c897067f..03582ee88 100644
--- a/xc/programs/Imakefile
+++ b/xc/programs/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.68 94/04/07 15:10:02 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.69 94/07/06 16:26:01 mor Exp $
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
diff --git a/xc/programs/Xserver/Imakefile b/xc/programs/Xserver/Imakefile
index ebb6e8c3a..4e839428d 100644
--- a/xc/programs/Xserver/Imakefile
+++ b/xc/programs/Xserver/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.192 95/01/25 20:37:15 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.193 95/06/15 15:36:25 dpw Exp $
/*
* Server Master Makefile
*/
diff --git a/xc/programs/Xserver/PEX5/Imakefile b/xc/programs/Xserver/PEX5/Imakefile
index 8ab93c011..d57027b45 100644
--- a/xc/programs/Xserver/PEX5/Imakefile
+++ b/xc/programs/Xserver/PEX5/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.10 93/09/04 16:58:00 rws Exp $
+XCOMM $XConsortium: Imakefile,v 5.11 94/01/03 11:09:30 hersh Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h
index 710ddfdf4..bceb4e7a9 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/ddpex2.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ddpex2.h,v 5.1 91/02/16 09:54:51 rws Exp $ */
+/* $XConsortium: ddpex2.h,v 5.2 94/04/17 20:36:40 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miClip.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miClip.h
index 7be3ebf5e..c2e646479 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miClip.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miClip.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miClip.h,v 5.2 93/09/03 14:56:56 hersh Exp $ */
+/* $XConsortium: miClip.h,v 5.3 94/04/17 20:36:40 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h
index a30587a4f..164260863 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miFont.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miFont.h,v 5.3 91/07/12 17:53:07 hersh Exp $ */
+/* $XConsortium: miFont.h,v 5.4 94/04/17 20:36:41 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h
index 449bf4a67..4dbfe7a93 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miInfo.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miInfo.h,v 5.3 92/04/23 16:00:42 hersh Exp $ */
+/* $XConsortium: miInfo.h,v 5.4 94/04/17 20:36:41 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h
index 11d5ce9b1..c09425cb8 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLUT.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miLUT.h,v 5.3 92/12/30 16:20:43 hersh Exp $ */
+/* $XConsortium: miLUT.h,v 5.4 94/04/17 20:36:42 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h
index 5ee04a4e7..b2e769afb 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLight.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miLight.h,v 5.3 93/01/25 17:20:52 hersh Exp $ */
+/* $XConsortium: miLight.h,v 5.4 94/04/17 20:36:43 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h
index fce912789..8b6c5be4c 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miLineDash.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miLineDash.h,v 5.1 91/02/16 09:54:49 rws Exp $ */
+/* $XConsortium: miLineDash.h,v 5.2 94/04/17 20:36:43 rws Exp $ */
/*****************************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h
index 93360ee52..5241b8093 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miMarkers.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miMarkers.h,v 5.1 91/02/16 09:54:50 rws Exp $ */
+/* $XConsortium: miMarkers.h,v 5.2 94/04/17 20:36:44 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miNS.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miNS.h
index cd6898fff..49fab7a6c 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miNS.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miNS.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miNS.h,v 5.1 91/02/16 09:54:42 rws Exp $ */
+/* $XConsortium: miNS.h,v 5.2 94/04/17 20:36:44 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h
index f479cbc27..613188477 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miNurbs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miNurbs.h,v 5.2 91/07/01 08:27:32 rws Exp $ */
+/* $XConsortium: miNurbs.h,v 5.3 94/04/17 20:36:45 rws Exp $ */
/*****************************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miPick.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miPick.h
index 53b64083f..6bba053d4 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miPick.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miPick.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miPick.h,v 5.1 91/02/16 09:54:56 rws Exp $ */
+/* $XConsortium: miPick.h,v 5.2 94/04/17 20:36:45 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miRender.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miRender.h
index cab7b4322..220e8804b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miRender.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miRender.h
@@ -1,5 +1,5 @@
-/* $XConsortium: miRender.h,v 5.3 92/11/09 18:51:43 hersh Exp $ */
+/* $XConsortium: miRender.h,v 5.4 94/04/17 20:36:46 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h
index 835194b01..fcb720636 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miStrMacro.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miStrMacro.h,v 5.4 92/03/06 15:54:48 hersh Exp $ */
+/* $XConsortium: miStrMacro.h,v 5.5 94/04/17 20:36:46 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h
index 6912e3c20..13cf7d4cb 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miStruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miStruct.h,v 5.4 94/04/17 20:36:47 hersh Exp $ */
+/* $XConsortium: miStruct.h,v 5.5 94/07/11 11:17:31 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miText.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miText.h
index b865ed867..199522cca 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miText.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miText.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miText.h,v 5.1 91/02/16 09:54:52 rws Exp $ */
+/* $XConsortium: miText.h,v 5.2 94/04/17 20:36:47 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/miWks.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/miWks.h
index d5a1f7e27..b8c2e35ce 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/miWks.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/miWks.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miWks.h,v 5.3 93/09/06 15:23:06 rws Exp $ */
+/* $XConsortium: miWks.h,v 5.4 94/04/17 20:36:48 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h
index 11c03bb37..39cba8966 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/mipex.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mipex.h,v 5.4 93/09/03 14:57:01 hersh Exp $ */
+/* $XConsortium: mipex.h,v 5.5 94/04/17 20:36:48 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/include/mixform.h b/xc/programs/Xserver/PEX5/ddpex/mi/include/mixform.h
index a9b67661a..b7e33b761 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/include/mixform.h
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/include/mixform.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mixform.h,v 5.1 91/02/16 09:54:48 rws Exp $ */
+/* $XConsortium: mixform.h,v 5.2 94/04/17 20:36:49 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level0/README b/xc/programs/Xserver/PEX5/ddpex/mi/level0/README
index 1f6c3deea..731a1b758 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level0/README
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level0/README
@@ -1,5 +1,5 @@
-/* $XConsortium: README,v 5.1 91/02/16 09:54:58 rws Exp $ */
+/* $XConsortium: README,v 5.2 94/04/17 20:36:50 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile
index 5d9f3ea3a..838c8d0f8 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.8 94/09/13 22:20:17 dpw Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.9 94/11/21 18:31:59 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c
index 8607c2bee..5ae726cea 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/mi52stubs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexStr.c,v 5.5 94/09/09 20:32:50 hersh Exp $ */
+/* $XConsortium: mi52stubs.c,v 1.1 94/09/13 22:19:39 dpw Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c
index fa27dc5d9..df766f4d0 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miDDCtoGC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miDDCtoGC.c,v 5.5 93/09/03 15:00:20 hersh Exp $ */
+/* $XConsortium: miDDCtoGC.c,v 5.6 94/04/17 20:36:51 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c
index 861d93dfb..b11bc541a 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLevel1.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLevel1.c,v 5.1 91/02/16 09:55:00 rws Exp $ */
+/* $XConsortium: miLevel1.c,v 5.2 94/04/17 20:36:52 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c
index c57f89d59..b9df8da0d 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miListUtil.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miListUtil.c,v 5.2 93/09/03 15:00:25 hersh Exp $ */
+/* $XConsortium: miListUtil.c,v 5.3 94/04/17 20:36:52 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c
index 011d22291..fe68c2c84 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miLvl1Tab.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLvl1Tab.c,v 5.1 91/02/16 09:55:03 rws Exp $ */
+/* $XConsortium: miLvl1Tab.c,v 5.2 94/04/17 20:36:53 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c
index 679308966..68c1a9658 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miPck1Prim.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miPck1Prim.c,v 5.2 93/01/25 16:26:11 hersh Exp $ */
+/* $XConsortium: miPck1Prim.c,v 5.3 94/04/17 20:36:53 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c
index 16406b055..1008f8fa1 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndFArea.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRndFArea.c,v 5.4 93/09/03 15:00:27 hersh Exp $ */
+/* $XConsortium: miRndFArea.c,v 5.5 94/04/17 20:36:54 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c
index 6d9a575d0..f47f1d07e 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndMarkr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRndMarkr.c,v 5.5 93/09/03 15:00:30 hersh Exp $ */
+/* $XConsortium: miRndMarkr.c,v 5.6 94/04/17 20:36:55 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c
index 0edce13f9..e3656ed7b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndPLine.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRndPLine.c,v 5.1 91/02/16 09:55:04 rws Exp $ */
+/* $XConsortium: miRndPLine.c,v 5.2 94/04/17 20:36:55 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c
index e824e1bae..16004024f 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndTStrip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRndTStrip.c,v 5.2 92/12/03 19:46:04 hersh Exp $ */
+/* $XConsortium: miRndTStrip.c,v 5.3 94/04/17 20:36:56 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c
index e7763de32..b6b298180 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level1/miRndText.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRndText.c,v 5.1 91/02/16 09:55:04 rws Exp $ */
+/* $XConsortium: miRndText.c,v 5.2 94/04/17 20:36:57 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile
index 94b280491..d40e9bbf4 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.6 94/04/17 20:36:57 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.7 94/11/21 18:32:10 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c
index 5ba8ab497..cad507824 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/ddContext.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ddContext.c,v 5.9 93/09/03 15:06:34 hersh Exp $ */
+/* $XConsortium: ddContext.c,v 5.10 94/04/17 20:37:00 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c
index fdb684ed5..fd518506b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miBldXform.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miBldXform.c,v 5.6 94/01/07 09:47:48 dpw Exp $ */
+/* $XConsortium: miBldXform.c,v 5.7 94/04/17 20:37:01 dpw Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c
index 3ff2ebab3..a39b81e06 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCellArray.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miCellArray.c,v 5.5 93/09/03 15:06:13 hersh Exp $ */
+/* $XConsortium: miCellArray.c,v 5.6 94/04/17 20:37:02 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c
index 7c5ee336e..d540f98cb 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miClip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miClip.c,v 5.3 93/09/03 15:05:35 hersh Exp $ */
+/* $XConsortium: miClip.c,v 5.4 94/04/17 20:37:03 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c
index 98b317801..a6202f672 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miConvert.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miConvert.c,v 5.6 93/09/03 15:05:57 hersh Exp $ */
+/* $XConsortium: miConvert.c,v 5.7 94/04/17 20:37:03 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c
index 6de8253d4..4436ce05e 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miCopy.c,v 5.8 94/04/17 20:37:04 hersh Exp gildea $ */
+/* $XConsortium: miCopy.c,v 5.9 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c
index 46e1759ff..41ed7d1cc 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miDestroy.c,v 5.3 94/04/17 20:37:05 rws Exp gildea $ */
+/* $XConsortium: miDestroy.c,v 5.4 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c
index 8667b2ef0..45d738e0a 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miFillArea.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miFillArea.c,v 5.9 93/09/03 15:05:42 hersh Exp $ */
+/* $XConsortium: miFillArea.c,v 5.10 94/04/17 20:37:05 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c
index e3e285399..8608543cd 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miInquire.c,v 5.9 94/04/17 20:37:06 hersh Exp gildea $ */
+/* $XConsortium: miInquire.c,v 5.10 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c
index 8727c37ac..2b4af4473 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLight.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLight.c,v 5.3 93/01/25 17:21:50 hersh Exp $ */
+/* $XConsortium: miLight.c,v 5.4 94/04/17 20:37:07 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c
index 631c2067d..20385a456 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miLvl2Tab.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLvl2Tab.c,v 5.4 92/08/12 15:32:49 hersh Exp $ */
+/* $XConsortium: miLvl2Tab.c,v 5.5 94/04/17 20:37:08 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c
index e41199130..fd860adda 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miMarkers.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miMarkers.c,v 5.4 92/12/29 17:14:17 mor Exp $ */
+/* $XConsortium: miMarkers.c,v 5.5 94/04/17 20:37:09 mor Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c
index 3ab1db30b..f39c3c1df 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNCurve.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miNCurve.c,v 5.2 91/05/01 14:43:51 hersh Exp $ */
+/* $XConsortium: miNCurve.c,v 5.3 94/04/17 20:37:10 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c
index 37129d95f..b84b68137 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSTrim.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miNSTrim.c,v 5.4 93/09/03 15:06:26 hersh Exp $ */
+/* $XConsortium: miNSTrim.c,v 5.5 94/04/17 20:37:11 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c
index 6d44ba6d2..3557cb0c5 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNSurf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miNSurf.c,v 5.9 93/09/03 15:06:29 hersh Exp $ */
+/* $XConsortium: miNSurf.c,v 5.10 94/04/17 20:37:12 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c
index d7e4c24a4..ee9942170 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miNurbs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miNurbs.c,v 5.4 93/09/03 15:06:20 hersh Exp $ */
+/* $XConsortium: miNurbs.c,v 5.5 94/04/17 20:37:13 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c
index 5a5954a1e..75c195bb5 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miOCs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miOCs.c,v 5.5 93/09/03 15:05:39 hersh Exp $ */
+/* $XConsortium: miOCs.c,v 5.6 94/04/17 20:37:14 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c
index 90daf423e..44a9ca658 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPickPrim.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miPickPrim.c,v 5.7 93/09/03 15:06:23 hersh Exp $ */
+/* $XConsortium: miPickPrim.c,v 5.8 94/04/17 20:37:15 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c
index 3c1e34178..bb731934c 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miPolyLine.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miPolyLine.c,v 5.4 92/12/29 17:12:53 mor Exp $ */
+/* $XConsortium: miPolyLine.c,v 5.5 94/04/17 20:37:16 mor Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c
index 5ae69a3de..93bd94d9b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miQuadMesh.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miQuadMesh.c,v 5.4 93/09/03 15:06:10 hersh Exp $ */
+/* $XConsortium: miQuadMesh.c,v 5.5 94/04/17 20:37:16 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c
index ab45c3abb..7966d9b09 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miReplace.c,v 5.4 94/04/17 20:37:17 rws Exp gildea $ */
+/* $XConsortium: miReplace.c,v 5.5 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c
index 729eb8120..9619d3ad2 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSOFAS.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miSOFAS.c,v 5.3 93/09/03 15:06:18 hersh Exp $ */
+/* $XConsortium: miSOFAS.c,v 5.4 94/04/17 20:37:17 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c
index 37056e6c3..ec3a1609b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miSearch.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miSearch.c,v 5.5 93/09/03 15:06:38 hersh Exp $ */
+/* $XConsortium: miSearch.c,v 5.6 94/04/17 20:37:18 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c
index 36c2d415f..2df74c1e7 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTestOCs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miTestOCs.c,v 5.1 91/02/16 09:55:20 rws Exp $ */
+/* $XConsortium: miTestOCs.c,v 5.2 94/04/17 20:37:19 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c
index bc1554be7..9ebade58b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miText.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miText.c,v 5.12 93/09/03 15:05:45 hersh Exp $ */
+/* $XConsortium: miText.c,v 5.13 94/04/17 20:37:19 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c
index 4bbc9d0d9..0fe345dc1 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTrans.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miTrans.c,v 5.2 91/05/01 14:34:41 hersh Exp $ */
+/* $XConsortium: miTrans.c,v 5.3 94/04/17 20:37:21 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c
index e802b28a2..2b71d7fcf 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miTriStrip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miTriStrip.c,v 5.11 93/09/03 15:06:00 hersh Exp $ */
+/* $XConsortium: miTriStrip.c,v 5.12 94/04/17 20:37:22 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c
index 2dc3aacd9..9767a2db7 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexOCParse.c,v 5.9 94/04/17 20:37:23 hersh Exp gildea $ */
+/* $XConsortium: pexOCParse.c,v 5.10 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile
index 86d839494..75004fc8a 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level3/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.8 94/04/17 20:37:24 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.9 94/11/21 18:32:21 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c
index efff0c0ad..3d26bdfe6 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRender.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRender.c,v 5.20 93/09/03 15:07:12 hersh Exp $ */
+/* $XConsortium: miRender.c,v 5.21 94/04/17 20:37:25 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c
index e9737930c..eda588a48 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level3/miRndrPick.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miRndrPick.c,v 1.10 93/09/03 15:07:35 hersh Exp $ */
+/* $XConsortium: miRndrPick.c,v 1.11 94/04/17 20:37:26 hersh Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile
index 6bd965e5e..c047f9e12 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.10 94/12/11 12:13:48 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.11 95/01/12 18:38:15 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c
index a67e47eef..9065c3020 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_ex_str.c
@@ -1,4 +1,4 @@
-/* $XConsortium: css_ex_str.c,v 5.1 91/02/16 09:56:12 rws Exp $ */
+/* $XConsortium: css_ex_str.c,v 5.2 94/04/17 20:37:28 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c
index d0d7c1d1e..a3ba073fa 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_plain.c
@@ -1,4 +1,4 @@
-/* $XConsortium: css_plain.c,v 5.4 91/12/26 18:15:31 hersh Exp $ */
+/* $XConsortium: css_plain.c,v 5.5 94/04/17 20:37:28 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c
index 8ae04d49a..557af0b4e 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/css_tbls.c
@@ -1,4 +1,4 @@
-/* $XConsortium: css_tbls.c,v 5.3 92/08/12 15:32:12 hersh Exp $ */
+/* $XConsortium: css_tbls.c,v 5.4 94/04/17 20:37:31 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c
index 91438f149..99cfe064a 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miDynamics.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miDynamics.c,v 5.2 92/12/30 16:44:38 hersh Exp $ */
+/* $XConsortium: miDynamics.c,v 5.3 94/04/17 20:37:31 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c
index 6a1721989..debc8299c 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miPick.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miPick.c,v 5.7 92/11/17 17:34:08 hersh Exp $ */
+/* $XConsortium: miPick.c,v 5.8 94/04/17 20:37:32 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c
index 85225db71..a8b7402b5 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miSC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miSC.c,v 5.3 92/11/19 15:14:55 hersh Exp $ */
+/* $XConsortium: miSC.c,v 5.4 94/04/17 20:37:32 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c
index 7ef4540a7..7bf23045b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miStruct.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miStruct.c,v 5.11 92/11/09 18:57:46 hersh Exp $ */
+/* $XConsortium: miStruct.c,v 5.12 94/04/17 20:37:33 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c
index df9513d4d..2dc4d6be1 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miTraverse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miTraverse.c,v 5.5 92/11/17 17:34:39 hersh Exp $ */
+/* $XConsortium: miTraverse.c,v 5.6 94/04/17 20:37:34 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c
index 54927a18c..01d178db2 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level4/miWks.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miWks.c,v 5.14 94/04/17 20:37:35 rws Exp dpw $ */
+/* $XConsortium: miWks.c,v 5.15 94/10/31 15:14:01 dpw Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile b/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile
index a209397b9..8d58ec0d7 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.10 94/12/11 12:15:22 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.11 95/01/12 18:39:03 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c
index 18845518d..5c7cc8189 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miClrApLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miClrApLUT.c,v 5.1 91/02/16 09:56:22 rws Exp $ */
+/* $XConsortium: miClrApLUT.c,v 5.2 94/04/17 20:37:37 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c
index 3313b0ec9..5032694c4 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miColrLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miColrLUT.c,v 5.1 91/02/16 09:56:23 rws Exp $ */
+/* $XConsortium: miColrLUT.c,v 5.2 94/04/17 20:37:38 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c
index f06120c7c..ccfb8c343 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miDCueLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miDCueLUT.c,v 5.1 91/02/16 09:56:25 rws Exp $ */
+/* $XConsortium: miDCueLUT.c,v 5.2 94/04/17 20:37:38 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c
index 5d313b962..3be8e9038 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miEdgeLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miEdgeLUT.c,v 5.1 91/02/16 09:56:25 rws Exp $ */
+/* $XConsortium: miEdgeLUT.c,v 5.2 94/04/17 20:37:39 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c
index 6d152b827..efe749c57 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFont.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miFont.c,v 5.6 93/09/23 16:16:08 rws Exp $ */
+/* $XConsortium: miFont.c,v 5.7 94/04/17 20:37:39 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c
index c0fe492af..d9556ea6e 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miFontLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miFontLUT.c,v 5.1 91/02/16 09:56:27 rws Exp $ */
+/* $XConsortium: miFontLUT.c,v 5.2 94/04/17 20:37:40 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c
index ffc84a72c..e1336cc9c 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miIntLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miIntLUT.c,v 5.1 91/02/16 09:56:28 rws Exp $ */
+/* $XConsortium: miIntLUT.c,v 5.2 94/04/17 20:37:41 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c
index 60f8151b1..79a58bab8 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLUT.c,v 5.1 91/02/16 09:56:16 rws Exp $ */
+/* $XConsortium: miLUT.c,v 5.2 94/04/17 20:37:41 rws Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci
index b30e6c6f3..36ee3f8ec 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLUTProcs.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: miLUTProcs.ci,v 5.5 92/12/30 16:21:34 hersh Exp $ */
+/* $XConsortium: miLUTProcs.ci,v 5.6 94/04/17 20:37:42 hersh Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c
index ed815dfa3..0e710212d 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLightLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLightLUT.c,v 5.2 91/03/19 21:27:43 hersh Exp $ */
+/* $XConsortium: miLightLUT.c,v 5.3 94/04/17 20:37:43 hersh Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c
index 0869ea66a..d25c662d0 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miLineLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miLineLUT.c,v 5.1 91/02/16 09:56:30 rws Exp $ */
+/* $XConsortium: miLineLUT.c,v 5.2 94/04/17 20:37:43 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c
index 955965649..a6f029e44 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMarkLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miMarkLUT.c,v 5.1 91/02/16 09:56:31 rws Exp $ */
+/* $XConsortium: miMarkLUT.c,v 5.2 94/04/17 20:37:44 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c
index a8e08f2c2..50ccb9465 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miMisc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miMisc.c,v 5.8 92/11/16 13:32:06 mor Exp $ */
+/* $XConsortium: miMisc.c,v 5.9 94/04/17 20:37:44 mor Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c
index 37d1da558..ec928972b 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miNS.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miNS.c,v 5.2 91/11/15 19:39:51 hersh Exp $ */
+/* $XConsortium: miNS.c,v 5.3 94/04/17 20:37:45 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c
index 434114214..d7b6ba944 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miPattLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miPattLUT.c,v 5.3 92/12/30 16:21:28 hersh Exp $ */
+/* $XConsortium: miPattLUT.c,v 5.4 94/04/17 20:37:46 hersh Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c
index 4de0b1e15..6c5995689 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miTextLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miTextLUT.c,v 5.1 91/02/16 09:56:33 rws Exp $ */
+/* $XConsortium: miTextLUT.c,v 5.2 94/04/17 20:37:46 rws Exp $ */
/*
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c
index 27c83e9b6..34aac6922 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miUtils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miUtils.c,v 5.4 93/09/03 15:16:14 hersh Exp $ */
+/* $XConsortium: miUtils.c,v 5.5 94/04/17 20:37:47 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c
index 54ec55bab..595e327ca 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/shared/miViewLUT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miViewLUT.c,v 5.1 91/02/16 09:56:34 rws Exp $ */
+/* $XConsortium: miViewLUT.c,v 5.2 94/04/17 20:37:47 rws Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile b/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile
index 93fe26e44..77909e5aa 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.7 94/04/17 20:36:03 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.8 94/11/21 18:31:20 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c
index aaf5926fc..fa3665b8b 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexBuf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dipexBuf.c,v 5.2 93/01/25 16:11:56 hersh Exp $ */
+/* $XConsortium: dipexBuf.c,v 5.3 94/04/17 20:36:03 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c
index 33ac93ff4..0b48ea9b3 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexExt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dipexExt.c,v 5.10 93/07/12 09:40:07 dpw Exp $ */
+/* $XConsortium: dipexExt.c,v 5.11 94/04/17 20:36:04 dpw Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c
index 3b7c1ff69..6570d5b21 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/dipexParse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dipexParse.c,v 5.1 91/02/16 09:56:41 rws Exp $ */
+/* $XConsortium: dipexParse.c,v 5.2 94/04/17 20:36:04 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/pexDump.c b/xc/programs/Xserver/PEX5/dipex/dispatch/pexDump.c
index 7198e4ab7..0fcc72dc9 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/pexDump.c
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/pexDump.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexDump.c,v 5.2 94/01/21 22:08:41 dpw Exp $ */
+/* $XConsortium: pexDump.c,v 5.3 94/04/17 20:36:05 dpw Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/pexError.c b/xc/programs/Xserver/PEX5/dipex/dispatch/pexError.c
index 4b1cafef6..67bbefdb2 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/pexError.c
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/pexError.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexError.c,v 5.2 94/01/21 22:08:52 dpw Exp $ */
+/* $XConsortium: pexError.c,v 5.3 94/04/17 20:36:05 dpw Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c b/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c
index f4d650eed..abbc61163 100644
--- a/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c
+++ b/xc/programs/Xserver/PEX5/dipex/dispatch/pexUtils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexUtils.c,v 5.7 93/09/03 14:52:22 hersh Exp $ */
+/* $XConsortium: pexUtils.c,v 5.8 94/04/17 20:36:06 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/Imakefile b/xc/programs/Xserver/PEX5/dipex/objects/Imakefile
index 9d5c37b2c..0c67af21e 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/Imakefile
+++ b/xc/programs/Xserver/PEX5/dipex/objects/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.10 94/11/21 18:31:30 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.11 94/12/11 12:22:07 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c b/xc/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c
index 2a7fb239a..d7706f61b 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexAccBuf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexAccBuf.c,v 5.3 94/04/17 20:36:09 hersh Exp $ */
+/* $XConsortium: pexAccBuf.c,v 1.1 94/09/08 19:48:15 hersh Exp $ */
/*
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c b/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c
index a35b715df..b388de48a 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexFont.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexFont.c,v 5.6 92/12/01 17:18:00 hersh Exp $ */
+/* $XConsortium: pexFont.c,v 5.7 94/04/17 20:36:07 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c b/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c
index a47b2676e..5aa2b9130 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexInfo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexInfo.c,v 5.5 94/04/17 20:36:08 hersh Exp hersh $ */
+/* $XConsortium: pexInfo.c,v 5.6 94/09/09 20:32:50 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c b/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c
index 2f03712f9..00dfe18ae 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexLut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexLut.c,v 5.4 94/04/17 20:36:08 hersh Exp hersh $ */
+/* $XConsortium: pexLut.c,v 5.5 94/09/09 20:32:50 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c b/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c
index 203d76497..a259644df 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexNs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexNs.c,v 5.2 92/12/01 17:17:57 hersh Exp $ */
+/* $XConsortium: pexNs.c,v 5.3 94/04/17 20:36:09 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c b/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c
index 211c9a798..8c5d26d74 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexPc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexPc.c,v 5.9 92/12/01 17:17:54 hersh Exp $ */
+/* $XConsortium: pexPc.c,v 5.10 94/04/17 20:36:10 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c b/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c
index d10793b37..0a053a57c 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexPhigs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexPhigs.c,v 5.4 92/12/01 17:17:22 hersh Exp $ */
+/* $XConsortium: pexPhigs.c,v 5.5 94/04/17 20:36:11 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c b/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c
index e57c1010a..6495668c9 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexPick.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexPick.c,v 5.2 92/03/04 14:16:12 hersh Exp $ */
+/* $XConsortium: pexPick.c,v 5.3 94/04/17 20:36:11 hersh Exp $ */
/*
Copyright (c) 1989, 1990, 1991 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c b/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c
index 8f6d75fe2..e0dc07b65 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexRndr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexRndr.c,v 5.28 94/04/17 20:36:12 rws Exp hersh $ */
+/* $XConsortium: pexRndr.c,v 5.29 94/09/09 20:32:50 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c b/xc/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c
index 86debb71c..5431820e3 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexRndrPick.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexRndrPick.c,v 1.8 92/12/14 16:17:44 hersh Exp $ */
+/* $XConsortium: pexRndrPick.c,v 1.9 94/04/17 20:36:13 hersh Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c b/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c
index 79012c55c..e03872b47 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexSc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexSc.c,v 5.8 93/09/03 14:53:24 hersh Exp $ */
+/* $XConsortium: pexSc.c,v 5.9 94/04/17 20:36:13 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexStr.c b/xc/programs/Xserver/PEX5/dipex/objects/pexStr.c
index 12dccf19f..21061b201 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexStr.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexStr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexStr.c,v 5.4 94/04/17 20:36:14 hersh Exp hersh $ */
+/* $XConsortium: pexStr.c,v 5.5 94/09/09 20:32:50 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/objects/pexTM.c b/xc/programs/Xserver/PEX5/dipex/objects/pexTM.c
index 3b2715449..6ae10106f 100644
--- a/xc/programs/Xserver/PEX5/dipex/objects/pexTM.c
+++ b/xc/programs/Xserver/PEX5/dipex/objects/pexTM.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexTM.c,v 1.1 94/09/01 18:16:32 hersh Exp hersh $ */
+/* $XConsortium: pexTM.c,v 1.2 94/09/09 20:32:50 hersh Exp $ */
/*
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/ConvName.ci b/xc/programs/Xserver/PEX5/dipex/swap/ConvName.ci
index 2e06e7317..78924743d 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/ConvName.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/ConvName.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: ConvName.ci,v 5.1 91/02/16 09:56:58 rws Exp $ */
+/* $XConsortium: ConvName.ci,v 5.2 94/04/17 20:36:15 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h b/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h
index 9400af7f3..72d665307 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ConvName.h,v 5.3 94/04/17 20:36:15 rws Exp gildea $ */
+/* $XConsortium: ConvName.h,v 5.4 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/Convert.c b/xc/programs/Xserver/PEX5/dipex/swap/Convert.c
index 88ed164d2..30b760d58 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/Convert.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/Convert.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Convert.c,v 5.4 91/12/30 18:23:37 hersh Exp $ */
+/* $XConsortium: Convert.c,v 5.5 94/04/17 20:36:16 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/Imakefile b/xc/programs/Xserver/PEX5/dipex/swap/Imakefile
index 563ddf8bb..480ea5601 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/Imakefile
+++ b/xc/programs/Xserver/PEX5/dipex/swap/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.12 94/11/21 18:31:38 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.13 94/12/01 16:47:39 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCTables.c b/xc/programs/Xserver/PEX5/dipex/swap/OCTables.c
index 91b3b671d..617b0256c 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCTables.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCTables.c
@@ -1,4 +1,4 @@
-/* $XConsortium: OCTables.c,v 5.1 91/02/16 09:57:27 rws Exp $ */
+/* $XConsortium: OCTables.c,v 5.2 94/04/17 20:36:17 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCattr.c b/xc/programs/Xserver/PEX5/dipex/swap/OCattr.c
index c600a8c25..5ffde0989 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCattr.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCattr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: OCattr.c,v 5.6 93/07/08 17:51:25 hersh Exp $ */
+/* $XConsortium: OCattr.c,v 5.7 94/04/17 20:36:17 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCattr.h b/xc/programs/Xserver/PEX5/dipex/swap/OCattr.h
index 02869112d..676eb8b82 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCattr.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCattr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: OCattr.h,v 5.2 93/05/07 16:07:51 hersh Exp $ */
+/* $XConsortium: OCattr.h,v 5.3 94/04/17 20:36:18 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.c b/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.c
index f245382e8..0cc3342ba 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.c
@@ -1,4 +1,4 @@
-/* $XConsortium: OCcolour.c,v 5.1 91/02/16 09:57:30 rws Exp $ */
+/* $XConsortium: OCcolour.c,v 5.2 94/04/17 20:36:18 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.ci b/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.ci
index 10d6db552..05da763a4 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: OCcolour.ci,v 5.2 91/03/15 19:00:18 hersh Exp $ */
+/* $XConsortium: OCcolour.ci,v 5.3 94/04/17 20:36:19 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.h b/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.h
index 5a588b887..58faf122d 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCcolour.h
@@ -1,4 +1,4 @@
-/* $XConsortium: OCcolour.h,v 5.1 91/02/16 09:57:29 rws Exp $ */
+/* $XConsortium: OCcolour.h,v 5.2 94/04/17 20:36:19 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/OCprim.h b/xc/programs/Xserver/PEX5/dipex/swap/OCprim.h
index 4b5bf44df..337a39657 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/OCprim.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/OCprim.h
@@ -1,4 +1,4 @@
-/* $XConsortium: OCprim.h,v 5.3 93/05/07 16:07:52 hersh Exp $ */
+/* $XConsortium: OCprim.h,v 5.4 94/04/17 20:36:20 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/RepTables.c b/xc/programs/Xserver/PEX5/dipex/swap/RepTables.c
index 4321f6d47..3dc3dbb8d 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/RepTables.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/RepTables.c
@@ -1,4 +1,4 @@
-/* $XConsortium: RepTables.c,v 5.1 91/02/16 09:57:25 rws Exp $ */
+/* $XConsortium: RepTables.c,v 5.2 94/04/17 20:36:20 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/Replies.ci b/xc/programs/Xserver/PEX5/dipex/swap/Replies.ci
index 9fcff45e1..622167c3d 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/Replies.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/Replies.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: Replies.ci,v 5.3 92/03/04 14:18:42 hersh Exp $ */
+/* $XConsortium: Replies.ci,v 5.4 94/04/17 20:36:21 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/ReqTables.c b/xc/programs/Xserver/PEX5/dipex/swap/ReqTables.c
index bbf3ada14..67558af8e 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/ReqTables.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/ReqTables.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ReqTables.c,v 5.1 91/02/16 09:57:26 rws Exp $ */
+/* $XConsortium: ReqTables.c,v 5.2 94/04/17 20:36:21 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/Requests.ci b/xc/programs/Xserver/PEX5/dipex/swap/Requests.ci
index bb80b1331..c7c36c187 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/Requests.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/Requests.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: Requests.ci,v 5.5 93/02/02 12:14:45 mor Exp $ */
+/* $XConsortium: Requests.ci,v 5.6 94/04/17 20:36:22 mor Exp $ */
/******************************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/Requests.h b/xc/programs/Xserver/PEX5/dipex/swap/Requests.h
index 51a31df84..a0dd82bad 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/Requests.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/Requests.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Requests.h,v 5.3 93/02/02 12:14:53 mor Exp $ */
+/* $XConsortium: Requests.h,v 5.4 94/04/17 20:36:22 mor Exp $ */
/******************************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/SwapConv.h b/xc/programs/Xserver/PEX5/dipex/swap/SwapConv.h
index ebe06f0f9..805afe2a1 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/SwapConv.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/SwapConv.h
@@ -1,4 +1,4 @@
-/* $XConsortium: SwapConv.h,v 5.2 91/12/30 18:23:59 hersh Exp $ */
+/* $XConsortium: SwapConv.h,v 5.3 94/04/17 20:36:23 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/UconvName.ci b/xc/programs/Xserver/PEX5/dipex/swap/UconvName.ci
index dad0dc056..96ca956a6 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/UconvName.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/UconvName.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: UconvName.ci,v 5.1 91/02/16 09:57:04 rws Exp $ */
+/* $XConsortium: UconvName.ci,v 5.2 94/04/17 20:36:23 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/UconvName.h b/xc/programs/Xserver/PEX5/dipex/swap/UconvName.h
index a0f9d269c..ee3331667 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/UconvName.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/UconvName.h
@@ -1,4 +1,4 @@
-/* $XConsortium: UconvName.h,v 5.3 94/04/17 20:36:24 rws Exp gildea $ */
+/* $XConsortium: UconvName.h,v 5.4 95/06/09 22:14:34 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/cOCTables.ci b/xc/programs/Xserver/PEX5/dipex/swap/cOCTables.ci
index c8a76627d..c4e9351f7 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/cOCTables.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/cOCTables.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: cOCTables.ci,v 1.4 93/07/08 17:51:49 hersh Exp $ */
+/* $XConsortium: cOCTables.ci,v 1.5 94/04/17 20:36:24 hersh Exp $ */
/* Automatically generated OC table
*/
/******************************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/cOCprim.c b/xc/programs/Xserver/PEX5/dipex/swap/cOCprim.c
index d312f87b1..2be0a8c77 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/cOCprim.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/cOCprim.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cOCprim.c,v 5.9 93/09/03 14:49:37 hersh Exp $ */
+/* $XConsortium: cOCprim.c,v 5.10 94/04/17 20:36:25 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/check.c b/xc/programs/Xserver/PEX5/dipex/swap/check.c
index 28cff3241..f04c3b3d0 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/check.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/check.c
@@ -1,4 +1,4 @@
-/* $XConsortium: check.c,v 5.5 92/03/04 14:18:59 hersh Exp $ */
+/* $XConsortium: check.c,v 5.6 94/04/17 20:36:28 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/convEv.c b/xc/programs/Xserver/PEX5/dipex/swap/convEv.c
index 1797a9bba..c1e51e365 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/convEv.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/convEv.c
@@ -1,4 +1,4 @@
-/* $XConsortium: convEv.c,v 1.1 92/03/04 14:19:24 hersh Exp $ */
+/* $XConsortium: convEv.c,v 1.2 94/04/17 20:36:28 hersh Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/convReq.c b/xc/programs/Xserver/PEX5/dipex/swap/convReq.c
index a70825548..36a6a645a 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/convReq.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/convReq.c
@@ -1,4 +1,4 @@
-/* $XConsortium: convReq.c,v 5.16 92/11/24 13:12:52 mor Exp $ */
+/* $XConsortium: convReq.c,v 5.17 94/04/17 20:36:29 mor Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/convReq.h b/xc/programs/Xserver/PEX5/dipex/swap/convReq.h
index 72ccd169a..20db1e6ff 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/convReq.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/convReq.h
@@ -1,4 +1,4 @@
-/* $XConsortium: convReq.h,v 5.2 92/03/04 14:18:57 hersh Exp $ */
+/* $XConsortium: convReq.h,v 5.3 94/04/17 20:36:30 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/convUtil.c b/xc/programs/Xserver/PEX5/dipex/swap/convUtil.c
index 32a04ca9b..5888489d8 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/convUtil.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/convUtil.c
@@ -1,4 +1,4 @@
-/* $XConsortium: convUtil.c,v 5.3 91/05/01 17:14:22 hersh Exp $ */
+/* $XConsortium: convUtil.c,v 5.4 94/04/17 20:36:30 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/convUtil.h b/xc/programs/Xserver/PEX5/dipex/swap/convUtil.h
index 44963431a..7770efaa9 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/convUtil.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/convUtil.h
@@ -1,4 +1,4 @@
-/* $XConsortium: convUtil.h,v 5.1 91/02/16 09:57:13 rws Exp $ */
+/* $XConsortium: convUtil.h,v 5.2 94/04/17 20:36:31 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/convertStr.h b/xc/programs/Xserver/PEX5/dipex/swap/convertStr.h
index c71657e45..d5e8a6b5d 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/convertStr.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/convertStr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: convertStr.h,v 5.3 92/08/12 15:46:12 hersh Exp $ */
+/* $XConsortium: convertStr.h,v 5.4 94/04/17 20:36:31 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/floatconv.c b/xc/programs/Xserver/PEX5/dipex/swap/floatconv.c
index 32c5c7eeb..068c9e4e7 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/floatconv.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/floatconv.c
@@ -1,4 +1,4 @@
-/* $XConsortium: floatconv.c,v 5.5 91/12/30 18:23:51 hersh Exp $ */
+/* $XConsortium: floatconv.c,v 5.6 94/04/17 20:36:32 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/floatconv.h b/xc/programs/Xserver/PEX5/dipex/swap/floatconv.h
index 6c2ad54f9..928b3fafc 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/floatconv.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/floatconv.h
@@ -1,4 +1,4 @@
-/* $XConsortium: floatconv.h,v 5.4 91/07/01 16:27:01 hersh Exp $ */
+/* $XConsortium: floatconv.h,v 5.5 91/12/30 18:23:15 hersh Exp $ */
/*
* Copyright (c) 1988-1991 by Sun Microsystems and the X Consortium.
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/uOCTables.ci b/xc/programs/Xserver/PEX5/dipex/swap/uOCTables.ci
index d0e3190b6..255eb3445 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/uOCTables.ci
+++ b/xc/programs/Xserver/PEX5/dipex/swap/uOCTables.ci
@@ -1,4 +1,4 @@
-/* $XConsortium: uOCTables.ci,v 5.3 93/07/08 17:51:52 hersh Exp $ */
+/* $XConsortium: uOCTables.ci,v 5.4 94/04/17 20:36:33 hersh Exp $ */
/* Automatically generated OC table
*/
/******************************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/uOCprim.c b/xc/programs/Xserver/PEX5/dipex/swap/uOCprim.c
index 7e2a5f01d..272bdd0e9 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/uOCprim.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/uOCprim.c
@@ -1,4 +1,4 @@
-/* $XConsortium: uOCprim.c,v 5.9 93/09/03 14:48:56 hersh Exp $ */
+/* $XConsortium: uOCprim.c,v 5.10 94/04/17 20:36:33 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.c b/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.c
index 5bea07bb6..e54c9d211 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.c
+++ b/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.c
@@ -1,4 +1,4 @@
-/* $XConsortium: uconvRep.c,v 5.14 92/11/24 13:13:35 mor Exp $ */
+/* $XConsortium: uconvRep.c,v 5.15 94/04/17 20:36:34 mor Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.h b/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.h
index 598db62c5..c1b1eb711 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/uconvRep.h
@@ -1,4 +1,4 @@
-/* $XConsortium: uconvRep.h,v 5.2 92/03/04 14:19:18 hersh Exp $ */
+/* $XConsortium: uconvRep.h,v 5.3 94/04/17 20:36:35 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk b/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk
index a43db4efa..5a340c8e5 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk
+++ b/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.awk
@@ -1,5 +1,5 @@
##
-# $XConsortium: OCReduce.awk,v 5.1 91/02/16 09:57:00 rws Exp $
+# $XConsortium: OCReduce.awk,v 5.2 94/04/17 20:36:36 rws Exp $
##
###########################################################################
## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed b/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed
index 9f1574cd7..0762e1187 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed
+++ b/xc/programs/Xserver/PEX5/dipex/swap/util/OCReduce.sed
@@ -1,5 +1,5 @@
##
-# $XConsortium: OCReduce.sed,v 5.1 91/02/16 09:57:30 rws Exp $
+# $XConsortium: OCReduce.sed,v 5.2 94/04/17 20:36:37 rws Exp $
##
###########################################################################
## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk b/xc/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk
index d47bccd35..397aff41f 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk
+++ b/xc/programs/Xserver/PEX5/dipex/swap/util/OCTables.awk
@@ -1,4 +1,4 @@
-# $XConsortium: OCTables.awk,v 5.1 91/02/16 09:57:01 rws Exp $
+# $XConsortium: OCTables.awk,v 5.2 94/04/17 20:36:37 rws Exp $
###########################################################################
## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
##
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk b/xc/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk
index 4a1419841..69569704e 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk
+++ b/xc/programs/Xserver/PEX5/dipex/swap/util/ReqSame.awk
@@ -1,4 +1,4 @@
-# $XConsortium: ReqSame.awk,v 5.2 91/03/15 19:00:47 hersh Exp $
+# $XConsortium: ReqSame.awk,v 5.3 94/04/17 20:36:38 hersh Exp $
###########################################################################
## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
##
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk b/xc/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk
index b5360cac7..cf48fbdf6 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk
+++ b/xc/programs/Xserver/PEX5/dipex/swap/util/ReqTab.awk
@@ -1,4 +1,4 @@
-# $XConsortium: ReqTab.awk,v 5.1 91/02/16 09:57:03 rws Exp $
+# $XConsortium: ReqTab.awk,v 5.2 94/04/17 20:36:38 rws Exp $
###########################################################################
## Copyright 1990, 1991 by Sun Microsystems, Inc. and the X Consortium.
##
diff --git a/xc/programs/Xserver/PEX5/include/PEX.h b/xc/programs/Xserver/PEX5/include/PEX.h
index e86eef725..b5d28db44 100644
--- a/xc/programs/Xserver/PEX5/include/PEX.h
+++ b/xc/programs/Xserver/PEX5/include/PEX.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PEX.h,v 5.11 94/04/17 20:35:48 hersh Exp hersh $ */
+/* $XConsortium: PEX.h,v 5.12 94/09/09 20:21:31 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/PEXErr.h b/xc/programs/Xserver/PEX5/include/PEXErr.h
index 153a6c43b..ca2db0215 100644
--- a/xc/programs/Xserver/PEX5/include/PEXErr.h
+++ b/xc/programs/Xserver/PEX5/include/PEXErr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PEXErr.h,v 5.1 91/02/16 09:47:05 rws Exp $ */
+/* $XConsortium: PEXErr.h,v 5.2 94/04/17 20:35:49 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/PEXfuncs.h b/xc/programs/Xserver/PEX5/include/PEXfuncs.h
index 379b02a6a..8dcdaf4cd 100644
--- a/xc/programs/Xserver/PEX5/include/PEXfuncs.h
+++ b/xc/programs/Xserver/PEX5/include/PEXfuncs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PEXfuncs.h,v 5.2 91/02/16 09:47:08 rws Exp $ */
+/* $XConsortium: PEXfuncs.h,v 5.3 94/04/17 20:35:50 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/PEXmacs.h b/xc/programs/Xserver/PEX5/include/PEXmacs.h
index 9f27147be..cbb4a7f33 100644
--- a/xc/programs/Xserver/PEX5/include/PEXmacs.h
+++ b/xc/programs/Xserver/PEX5/include/PEXmacs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PEXmacs.h,v 5.2 91/02/16 09:46:58 rws Exp $ */
+/* $XConsortium: PEXmacs.h,v 5.3 94/04/17 20:35:50 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/PEXproto.h b/xc/programs/Xserver/PEX5/include/PEXproto.h
index 151970a84..a140689e6 100644
--- a/xc/programs/Xserver/PEX5/include/PEXproto.h
+++ b/xc/programs/Xserver/PEX5/include/PEXproto.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PEXproto.h,v 5.7 94/04/17 20:35:51 rws Exp hersh $ */
+/* $XConsortium: PEXproto.h,v 5.8 94/09/09 20:21:31 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/PEXprotost.h b/xc/programs/Xserver/PEX5/include/PEXprotost.h
index 397c8aace..9a7506c24 100644
--- a/xc/programs/Xserver/PEX5/include/PEXprotost.h
+++ b/xc/programs/Xserver/PEX5/include/PEXprotost.h
@@ -1,4 +1,4 @@
-/* $XConsortium: PEXprotost.h,v 5.5 92/06/03 18:31:58 hersh Exp $ */
+/* $XConsortium: PEXprotost.h,v 5.6 94/04/17 20:35:52 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/ddpex.h b/xc/programs/Xserver/PEX5/include/ddpex.h
index 00250b63c..15a9128e2 100644
--- a/xc/programs/Xserver/PEX5/include/ddpex.h
+++ b/xc/programs/Xserver/PEX5/include/ddpex.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ddpex.h,v 5.13 93/07/09 10:53:17 rws Exp $ */
+/* $XConsortium: ddpex.h,v 5.14 94/04/17 20:35:53 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/ddpex3.h b/xc/programs/Xserver/PEX5/include/ddpex3.h
index 07b8bcde5..cb8af4c09 100644
--- a/xc/programs/Xserver/PEX5/include/ddpex3.h
+++ b/xc/programs/Xserver/PEX5/include/ddpex3.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ddpex3.h,v 5.1 91/02/16 09:57:37 rws Exp $ */
+/* $XConsortium: ddpex3.h,v 5.2 94/04/17 20:35:55 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/ddpex4.h b/xc/programs/Xserver/PEX5/include/ddpex4.h
index cb85ec6ed..312c79fab 100644
--- a/xc/programs/Xserver/PEX5/include/ddpex4.h
+++ b/xc/programs/Xserver/PEX5/include/ddpex4.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ddpex4.h,v 5.1 91/02/16 09:57:38 rws Exp $ */
+/* $XConsortium: ddpex4.h,v 5.2 94/04/17 20:35:56 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/dipex.h b/xc/programs/Xserver/PEX5/include/dipex.h
index 95768ff31..7a2a3180d 100644
--- a/xc/programs/Xserver/PEX5/include/dipex.h
+++ b/xc/programs/Xserver/PEX5/include/dipex.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dipex.h,v 5.5 92/11/24 13:00:28 mor Exp $ */
+/* $XConsortium: dipex.h,v 5.6 94/04/17 20:35:57 mor Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/pexError.h b/xc/programs/Xserver/PEX5/include/pexError.h
index 568acf4a5..df218d232 100644
--- a/xc/programs/Xserver/PEX5/include/pexError.h
+++ b/xc/programs/Xserver/PEX5/include/pexError.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pexError.h,v 5.4 94/02/23 15:53:30 dpw Exp $ */
+/* $XConsortium: pexError.h,v 5.5 94/04/17 20:35:57 dpw Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/pexExtract.h b/xc/programs/Xserver/PEX5/include/pexExtract.h
index 356ebe325..51ead31ef 100644
--- a/xc/programs/Xserver/PEX5/include/pexExtract.h
+++ b/xc/programs/Xserver/PEX5/include/pexExtract.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pexExtract.h,v 5.8 93/09/03 14:47:03 hersh Exp $ */
+/* $XConsortium: pexExtract.h,v 5.9 94/04/17 20:35:58 hersh Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/pexLookup.h b/xc/programs/Xserver/PEX5/include/pexLookup.h
index 0ced90068..324309a5b 100644
--- a/xc/programs/Xserver/PEX5/include/pexLookup.h
+++ b/xc/programs/Xserver/PEX5/include/pexLookup.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pexLookup.h,v 5.1 91/02/16 09:57:42 rws Exp $ */
+/* $XConsortium: pexLookup.h,v 5.2 94/04/17 20:35:58 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/pexSwap.h b/xc/programs/Xserver/PEX5/include/pexSwap.h
index a215b1ec3..b8ef292c4 100644
--- a/xc/programs/Xserver/PEX5/include/pexSwap.h
+++ b/xc/programs/Xserver/PEX5/include/pexSwap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pexSwap.h,v 5.6 93/09/18 10:56:04 rws Exp $ */
+/* $XConsortium: pexSwap.h,v 5.7 94/04/17 20:35:59 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/pexUtils.h b/xc/programs/Xserver/PEX5/include/pexUtils.h
index 8e5a903c7..ec278629d 100644
--- a/xc/programs/Xserver/PEX5/include/pexUtils.h
+++ b/xc/programs/Xserver/PEX5/include/pexUtils.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pexUtils.h,v 5.1 91/02/16 09:57:36 rws Exp $ */
+/* $XConsortium: pexUtils.h,v 5.2 94/04/17 20:35:59 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/include/pex_site.h b/xc/programs/Xserver/PEX5/include/pex_site.h
index 29cad03dc..7265ce134 100644
--- a/xc/programs/Xserver/PEX5/include/pex_site.h
+++ b/xc/programs/Xserver/PEX5/include/pex_site.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pex_site.h,v 5.1 91/02/16 09:57:43 rws Exp $ */
+/* $XConsortium: pex_site.h,v 5.2 94/04/17 20:36:00 rws Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/PEX5/ospex/Imakefile b/xc/programs/Xserver/PEX5/ospex/Imakefile
index b9a92d512..3c2863fe9 100644
--- a/xc/programs/Xserver/PEX5/ospex/Imakefile
+++ b/xc/programs/Xserver/PEX5/ospex/Imakefile
@@ -1,5 +1,5 @@
XCOMM
-XCOMM $XConsortium: Imakefile,v 5.6 94/04/17 20:36:01 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.7 94/11/21 18:30:58 kaleb Exp $
XCOMM
XCOMM
XCOMM Copyright 1989, 1990, 1991 by Sun Microsystems, Inc. and the X Consortium
diff --git a/xc/programs/Xserver/PEX5/ospex/osPexFont.c b/xc/programs/Xserver/PEX5/ospex/osPexFont.c
index 670dfb36b..440c6e509 100644
--- a/xc/programs/Xserver/PEX5/ospex/osPexFont.c
+++ b/xc/programs/Xserver/PEX5/ospex/osPexFont.c
@@ -1,4 +1,4 @@
-/* $XConsortium: osPexFont.c,v 5.7 93/09/24 12:03:11 rws Exp $ */
+/* $XConsortium: osPexFont.c,v 5.8 94/04/17 20:36:01 rws Exp $ */
/*
diff --git a/xc/programs/Xserver/XIE/Imakefile b/xc/programs/Xserver/XIE/Imakefile
index e94ddbb6b..0f96f0ed1 100644
--- a/xc/programs/Xserver/XIE/Imakefile
+++ b/xc/programs/Xserver/XIE/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 93/09/04 17:06:03 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.3 93/11/07 10:56:36 rws Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/XIE/dixie/Imakefile b/xc/programs/Xserver/XIE/dixie/Imakefile
index c049e96e7..7bae6e03a 100644
--- a/xc/programs/Xserver/XIE/dixie/Imakefile
+++ b/xc/programs/Xserver/XIE/dixie/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 93/11/06 15:48:24 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.4 94/11/21 18:30:24 kaleb Exp $
XCOMM build dixie archive
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/dixie/export/Imakefile b/xc/programs/Xserver/XIE/dixie/export/Imakefile
index 69df00fe4..19ede1e20 100644
--- a/xc/programs/Xserver/XIE/dixie/export/Imakefile
+++ b/xc/programs/Xserver/XIE/dixie/export/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 93/11/06 15:48:46 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.5 94/01/12 19:47:21 rws Exp $
XCOMM build device independent export element objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/dixie/export/echist.c b/xc/programs/Xserver/XIE/dixie/export/echist.c
index b9f40caed..f2e5d2baa 100644
--- a/xc/programs/Xserver/XIE/dixie/export/echist.c
+++ b/xc/programs/Xserver/XIE/dixie/export/echist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: echist.c,v 1.2 94/01/12 19:47:27 rws Exp $ */
+/* $XConsortium: echist.c,v 1.3 94/04/17 20:33:27 rws Exp $ */
/**** module echist.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/eclut.c b/xc/programs/Xserver/XIE/dixie/export/eclut.c
index 7ce5bd083..558da744a 100644
--- a/xc/programs/Xserver/XIE/dixie/export/eclut.c
+++ b/xc/programs/Xserver/XIE/dixie/export/eclut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: eclut.c,v 1.3 94/01/12 19:47:33 rws Exp $ */
+/* $XConsortium: eclut.c,v 1.4 94/04/17 20:33:28 rws Exp $ */
/**** module eclut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/ecphoto.c b/xc/programs/Xserver/XIE/dixie/export/ecphoto.c
index 09a2c1c89..b1b124ca7 100644
--- a/xc/programs/Xserver/XIE/dixie/export/ecphoto.c
+++ b/xc/programs/Xserver/XIE/dixie/export/ecphoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ecphoto.c,v 1.4 94/01/12 19:47:41 rws Exp $ */
+/* $XConsortium: ecphoto.c,v 1.5 94/04/17 20:33:28 rws Exp $ */
/**** module ecphoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/ecroi.c b/xc/programs/Xserver/XIE/dixie/export/ecroi.c
index e564ad528..68a32fc52 100644
--- a/xc/programs/Xserver/XIE/dixie/export/ecroi.c
+++ b/xc/programs/Xserver/XIE/dixie/export/ecroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ecroi.c,v 1.3 94/01/12 19:47:49 rws Exp $ */
+/* $XConsortium: ecroi.c,v 1.4 94/04/17 20:33:29 rws Exp $ */
/**** module ecroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/edraw.c b/xc/programs/Xserver/XIE/dixie/export/edraw.c
index cea4d9358..ebe403bea 100644
--- a/xc/programs/Xserver/XIE/dixie/export/edraw.c
+++ b/xc/programs/Xserver/XIE/dixie/export/edraw.c
@@ -1,4 +1,4 @@
-/* $XConsortium: edraw.c,v 1.3 94/01/12 19:47:58 rws Exp $ */
+/* $XConsortium: edraw.c,v 1.4 94/04/17 20:33:29 rws Exp $ */
/**** module edraw.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/edrawp.c b/xc/programs/Xserver/XIE/dixie/export/edrawp.c
index bb771f149..c5725d50e 100644
--- a/xc/programs/Xserver/XIE/dixie/export/edrawp.c
+++ b/xc/programs/Xserver/XIE/dixie/export/edrawp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: edrawp.c,v 1.3 94/01/12 19:48:08 rws Exp $ */
+/* $XConsortium: edrawp.c,v 1.4 94/04/17 20:33:30 rws Exp $ */
/**** module edrawp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/elut.c b/xc/programs/Xserver/XIE/dixie/export/elut.c
index a096ab484..88a4792c5 100644
--- a/xc/programs/Xserver/XIE/dixie/export/elut.c
+++ b/xc/programs/Xserver/XIE/dixie/export/elut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: elut.c,v 1.3 94/01/12 19:48:14 rws Exp $ */
+/* $XConsortium: elut.c,v 1.4 94/04/17 20:33:30 rws Exp $ */
/**** module elut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/ephoto.c b/xc/programs/Xserver/XIE/dixie/export/ephoto.c
index a0f5bf4d3..6a3fe6336 100644
--- a/xc/programs/Xserver/XIE/dixie/export/ephoto.c
+++ b/xc/programs/Xserver/XIE/dixie/export/ephoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ephoto.c,v 1.6 94/02/08 16:36:33 rws Exp $ */
+/* $XConsortium: ephoto.c,v 1.7 94/04/17 20:33:31 rws Exp $ */
/**** module ephoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/export/eroi.c b/xc/programs/Xserver/XIE/dixie/export/eroi.c
index f9e7dc6b6..73925ed76 100644
--- a/xc/programs/Xserver/XIE/dixie/export/eroi.c
+++ b/xc/programs/Xserver/XIE/dixie/export/eroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: eroi.c,v 1.3 94/01/12 19:48:26 rws Exp $ */
+/* $XConsortium: eroi.c,v 1.4 94/04/17 20:33:32 rws Exp $ */
/**** module eroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/Imakefile b/xc/programs/Xserver/XIE/dixie/import/Imakefile
index 5cb04a831..54bf0d033 100644
--- a/xc/programs/Xserver/XIE/dixie/import/Imakefile
+++ b/xc/programs/Xserver/XIE/dixie/import/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 93/11/01 10:22:37 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/06 15:51:22 rws Exp $
XCOMM build device independent import element objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/dixie/import/iclut.c b/xc/programs/Xserver/XIE/dixie/import/iclut.c
index a7a1c8acb..67d46a025 100644
--- a/xc/programs/Xserver/XIE/dixie/import/iclut.c
+++ b/xc/programs/Xserver/XIE/dixie/import/iclut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: iclut.c,v 1.3 94/01/12 19:48:54 rws Exp $ */
+/* $XConsortium: iclut.c,v 1.4 94/04/17 20:33:33 rws Exp $ */
/**** module iclut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/icphoto.c b/xc/programs/Xserver/XIE/dixie/import/icphoto.c
index c54369b4a..ea4309622 100644
--- a/xc/programs/Xserver/XIE/dixie/import/icphoto.c
+++ b/xc/programs/Xserver/XIE/dixie/import/icphoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: icphoto.c,v 1.3 94/01/12 19:49:02 rws Exp $ */
+/* $XConsortium: icphoto.c,v 1.4 94/04/17 20:33:34 rws Exp $ */
/**** module icphoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/icroi.c b/xc/programs/Xserver/XIE/dixie/import/icroi.c
index ca8d1fe86..2853f11e3 100644
--- a/xc/programs/Xserver/XIE/dixie/import/icroi.c
+++ b/xc/programs/Xserver/XIE/dixie/import/icroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: icroi.c,v 1.3 94/01/12 19:49:09 rws Exp $ */
+/* $XConsortium: icroi.c,v 1.4 94/04/17 20:33:34 rws Exp $ */
/**** module icroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/idraw.c b/xc/programs/Xserver/XIE/dixie/import/idraw.c
index 90851fcb6..9d57fa3b7 100644
--- a/xc/programs/Xserver/XIE/dixie/import/idraw.c
+++ b/xc/programs/Xserver/XIE/dixie/import/idraw.c
@@ -1,4 +1,4 @@
-/* $XConsortium: idraw.c,v 1.3 94/01/12 19:49:14 rws Exp $ */
+/* $XConsortium: idraw.c,v 1.4 94/04/17 20:33:35 rws Exp $ */
/**** module idraw.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/idrawp.c b/xc/programs/Xserver/XIE/dixie/import/idrawp.c
index 0143157fc..e631007c9 100644
--- a/xc/programs/Xserver/XIE/dixie/import/idrawp.c
+++ b/xc/programs/Xserver/XIE/dixie/import/idrawp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: idrawp.c,v 1.3 94/01/12 19:49:19 rws Exp $ */
+/* $XConsortium: idrawp.c,v 1.4 94/04/17 20:33:35 rws Exp $ */
/**** module idrawp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/ilut.c b/xc/programs/Xserver/XIE/dixie/import/ilut.c
index bfefd99df..96935c947 100644
--- a/xc/programs/Xserver/XIE/dixie/import/ilut.c
+++ b/xc/programs/Xserver/XIE/dixie/import/ilut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ilut.c,v 1.3 94/01/12 19:49:24 rws Exp $ */
+/* $XConsortium: ilut.c,v 1.4 94/04/17 20:33:36 rws Exp $ */
/**** module ilut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/iphoto.c b/xc/programs/Xserver/XIE/dixie/import/iphoto.c
index 03044a7aa..f0dbfb23c 100644
--- a/xc/programs/Xserver/XIE/dixie/import/iphoto.c
+++ b/xc/programs/Xserver/XIE/dixie/import/iphoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: iphoto.c,v 1.4 94/01/12 19:49:29 rws Exp $ */
+/* $XConsortium: iphoto.c,v 1.5 94/04/17 20:33:36 rws Exp $ */
/**** module iphoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/import/iroi.c b/xc/programs/Xserver/XIE/dixie/import/iroi.c
index 4ca075c70..70d2a45f4 100644
--- a/xc/programs/Xserver/XIE/dixie/import/iroi.c
+++ b/xc/programs/Xserver/XIE/dixie/import/iroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: iroi.c,v 1.3 94/01/12 19:49:34 rws Exp $ */
+/* $XConsortium: iroi.c,v 1.4 94/04/17 20:33:37 rws Exp $ */
/**** module iroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/Imakefile b/xc/programs/Xserver/XIE/dixie/process/Imakefile
index 698d6a571..6eeb848a2 100644
--- a/xc/programs/Xserver/XIE/dixie/process/Imakefile
+++ b/xc/programs/Xserver/XIE/dixie/process/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 93/11/01 10:22:54 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/06 15:52:53 rws Exp $
XCOMM build device independent processing element objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/dixie/process/parith.c b/xc/programs/Xserver/XIE/dixie/process/parith.c
index 4bbfb1cab..596fb9cd7 100644
--- a/xc/programs/Xserver/XIE/dixie/process/parith.c
+++ b/xc/programs/Xserver/XIE/dixie/process/parith.c
@@ -1,4 +1,4 @@
-/* $XConsortium: parith.c,v 1.3 94/01/12 19:53:39 rws Exp $ */
+/* $XConsortium: parith.c,v 1.4 94/04/17 20:33:38 rws Exp $ */
/**** module parith.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pbandc.c b/xc/programs/Xserver/XIE/dixie/process/pbandc.c
index f2badedb9..f30bc9712 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pbandc.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pbandc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pbandc.c,v 1.3 94/01/12 19:53:47 rws Exp $ */
+/* $XConsortium: pbandc.c,v 1.4 94/04/17 20:33:39 rws Exp $ */
/**** module pbandc.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pbande.c b/xc/programs/Xserver/XIE/dixie/process/pbande.c
index 554356b58..a1abbf7a1 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pbande.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pbande.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pbande.c,v 1.3 94/01/12 19:53:54 rws Exp $ */
+/* $XConsortium: pbande.c,v 1.4 94/04/17 20:33:39 rws Exp $ */
/**** module pbande.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pbands.c b/xc/programs/Xserver/XIE/dixie/process/pbands.c
index 3522b5105..11b3d580f 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pbands.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pbands.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pbands.c,v 1.2 94/01/12 19:54:01 rws Exp $ */
+/* $XConsortium: pbands.c,v 1.3 94/04/17 20:33:40 rws Exp $ */
/**** module pbands.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pblend.c b/xc/programs/Xserver/XIE/dixie/process/pblend.c
index 2dbbbabc7..21eef4197 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pblend.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pblend.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pblend.c,v 1.3 94/01/12 19:54:06 rws Exp $ */
+/* $XConsortium: pblend.c,v 1.4 94/04/17 20:33:40 rws Exp $ */
/**** module pblend.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c b/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c
index 1fdf5b2fd..a0f26f80a 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pcfrgb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pcfrgb.c,v 1.3 94/01/12 19:54:11 rws Exp $ */
+/* $XConsortium: pcfrgb.c,v 1.4 94/04/17 20:33:41 rws Exp $ */
/**** module pcfrgb.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pcfromi.c b/xc/programs/Xserver/XIE/dixie/process/pcfromi.c
index 3eef1506a..683aa5e05 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pcfromi.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pcfromi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pcfromi.c,v 1.3 94/01/12 19:54:16 rws Exp $ */
+/* $XConsortium: pcfromi.c,v 1.4 94/04/17 20:33:42 rws Exp $ */
/**** module pcfromi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pcnst.c b/xc/programs/Xserver/XIE/dixie/process/pcnst.c
index c67d3dcec..37bb5d8ec 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pcnst.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pcnst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pcnst.c,v 1.4 94/01/12 19:54:21 rws Exp $ */
+/* $XConsortium: pcnst.c,v 1.5 94/04/17 20:33:42 rws Exp $ */
/**** module pcnst.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pcomp.c b/xc/programs/Xserver/XIE/dixie/process/pcomp.c
index cea662a12..cef9f97df 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pcomp.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pcomp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pcomp.c,v 1.2 94/01/12 19:54:28 rws Exp $ */
+/* $XConsortium: pcomp.c,v 1.3 94/04/17 20:33:43 rws Exp $ */
/**** module pcomp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pconv.c b/xc/programs/Xserver/XIE/dixie/process/pconv.c
index 144493342..cad20bbc3 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pconv.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pconv.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pconv.c,v 1.4 94/01/12 19:54:34 rws Exp $ */
+/* $XConsortium: pconv.c,v 1.5 94/04/17 20:33:43 rws Exp $ */
/**** module pconv.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pctoi.c b/xc/programs/Xserver/XIE/dixie/process/pctoi.c
index 1423de9d9..03aab09f3 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pctoi.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pctoi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pctoi.c,v 1.5 94/04/17 20:33:44 rws Exp $ */
+/* $XConsortium: pctoi.c,v 1.6 94/05/10 13:28:24 dpw Exp $ */
/**** module pctoi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pctrgb.c b/xc/programs/Xserver/XIE/dixie/process/pctrgb.c
index f996fca8f..022b7baed 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pctrgb.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pctrgb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pctrgb.c,v 1.3 94/01/12 19:54:45 rws Exp $ */
+/* $XConsortium: pctrgb.c,v 1.4 94/04/17 20:33:45 rws Exp $ */
/**** module pctrgb.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pdither.c b/xc/programs/Xserver/XIE/dixie/process/pdither.c
index cb50f1387..9df514a4c 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pdither.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pdither.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pdither.c,v 1.5 94/03/27 15:00:19 rws Exp $ */
+/* $XConsortium: pdither.c,v 1.6 94/04/17 20:33:45 rws Exp $ */
/**** module pdither.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pgeom.c b/xc/programs/Xserver/XIE/dixie/process/pgeom.c
index d13eef14e..48d13951b 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pgeom.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pgeom.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pgeom.c,v 1.4 94/01/12 19:54:56 rws Exp $ */
+/* $XConsortium: pgeom.c,v 1.5 94/04/17 20:33:46 rws Exp $ */
/**** module pgeom.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/phist.c b/xc/programs/Xserver/XIE/dixie/process/phist.c
index 0113440f9..5a5b3906b 100644
--- a/xc/programs/Xserver/XIE/dixie/process/phist.c
+++ b/xc/programs/Xserver/XIE/dixie/process/phist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: phist.c,v 1.3 94/01/12 19:55:01 rws Exp $ */
+/* $XConsortium: phist.c,v 1.4 94/04/17 20:33:46 rws Exp $ */
/**** module phist.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/plogic.c b/xc/programs/Xserver/XIE/dixie/process/plogic.c
index be88f625d..b14bd6da7 100644
--- a/xc/programs/Xserver/XIE/dixie/process/plogic.c
+++ b/xc/programs/Xserver/XIE/dixie/process/plogic.c
@@ -1,4 +1,4 @@
-/* $XConsortium: plogic.c,v 1.3 94/01/12 19:55:06 rws Exp $ */
+/* $XConsortium: plogic.c,v 1.4 94/04/17 20:33:49 rws Exp $ */
/**** module plogic.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/pmath.c b/xc/programs/Xserver/XIE/dixie/process/pmath.c
index 3b6c2d82d..e912c3b5b 100644
--- a/xc/programs/Xserver/XIE/dixie/process/pmath.c
+++ b/xc/programs/Xserver/XIE/dixie/process/pmath.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pmath.c,v 1.2 94/01/12 19:55:12 rws Exp $ */
+/* $XConsortium: pmath.c,v 1.3 94/04/17 20:33:50 rws Exp $ */
/**** module pmath.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/ppaste.c b/xc/programs/Xserver/XIE/dixie/process/ppaste.c
index 894bc4c81..4c81b11a1 100644
--- a/xc/programs/Xserver/XIE/dixie/process/ppaste.c
+++ b/xc/programs/Xserver/XIE/dixie/process/ppaste.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppaste.c,v 1.3 94/01/12 19:55:16 rws Exp $ */
+/* $XConsortium: ppaste.c,v 1.4 94/04/17 20:33:50 rws Exp $ */
/**** module ppaste.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/ppoint.c b/xc/programs/Xserver/XIE/dixie/process/ppoint.c
index 57505e451..e60139800 100644
--- a/xc/programs/Xserver/XIE/dixie/process/ppoint.c
+++ b/xc/programs/Xserver/XIE/dixie/process/ppoint.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppoint.c,v 1.3 94/01/12 19:55:21 rws Exp $ */
+/* $XConsortium: ppoint.c,v 1.4 94/04/17 20:33:51 rws Exp $ */
/**** module ppoint.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/process/puncnst.c b/xc/programs/Xserver/XIE/dixie/process/puncnst.c
index 277f7c3a5..eb2786f78 100644
--- a/xc/programs/Xserver/XIE/dixie/process/puncnst.c
+++ b/xc/programs/Xserver/XIE/dixie/process/puncnst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: puncnst.c,v 1.3 94/01/12 19:55:26 rws Exp $ */
+/* $XConsortium: puncnst.c,v 1.4 94/04/17 20:33:51 rws Exp $ */
/**** module puncnst.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/Imakefile b/xc/programs/Xserver/XIE/dixie/request/Imakefile
index 6b072bec6..94ce81752 100644
--- a/xc/programs/Xserver/XIE/dixie/request/Imakefile
+++ b/xc/programs/Xserver/XIE/dixie/request/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 93/11/01 10:23:07 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/06 15:55:34 rws Exp $
XCOMM build device independent request objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/dixie/request/colorlst.c b/xc/programs/Xserver/XIE/dixie/request/colorlst.c
index 259e92605..ef3d54f5b 100644
--- a/xc/programs/Xserver/XIE/dixie/request/colorlst.c
+++ b/xc/programs/Xserver/XIE/dixie/request/colorlst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: colorlst.c,v 1.5 94/04/17 20:33:52 rws Exp $ */
+/* $XConsortium: colorlst.c,v 1.6 94/06/03 15:59:07 dpw Exp $ */
/**** module colorlst.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/difloat.c b/xc/programs/Xserver/XIE/dixie/request/difloat.c
index d59f92503..9b482f27d 100644
--- a/xc/programs/Xserver/XIE/dixie/request/difloat.c
+++ b/xc/programs/Xserver/XIE/dixie/request/difloat.c
@@ -1,4 +1,4 @@
-/* $XConsortium: difloat.c,v 1.4 94/04/17 20:33:53 rws Exp $ */
+/* $XConsortium: difloat.c,v 1.5 94/05/10 12:23:32 dpw Exp $ */
/**** module difloat.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/error.c b/xc/programs/Xserver/XIE/dixie/request/error.c
index f3773e792..0d117d58b 100644
--- a/xc/programs/Xserver/XIE/dixie/request/error.c
+++ b/xc/programs/Xserver/XIE/dixie/request/error.c
@@ -1,4 +1,4 @@
-/* $XConsortium: error.c,v 1.6 94/01/12 19:56:38 rws Exp $ */
+/* $XConsortium: error.c,v 1.7 94/04/17 20:33:54 rws Exp $ */
/**** module error.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/event.c b/xc/programs/Xserver/XIE/dixie/request/event.c
index f98439bd5..cdf4b7ad4 100644
--- a/xc/programs/Xserver/XIE/dixie/request/event.c
+++ b/xc/programs/Xserver/XIE/dixie/request/event.c
@@ -1,4 +1,4 @@
-/* $XConsortium: event.c,v 1.4 94/01/12 19:56:43 rws Exp $ */
+/* $XConsortium: event.c,v 1.5 94/04/17 20:33:54 rws Exp $ */
/**** module event.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/flo.c b/xc/programs/Xserver/XIE/dixie/request/flo.c
index 23fa26107..c2ea218af 100644
--- a/xc/programs/Xserver/XIE/dixie/request/flo.c
+++ b/xc/programs/Xserver/XIE/dixie/request/flo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: flo.c,v 1.6 94/04/17 20:33:55 rws Exp $ */
+/* $XConsortium: flo.c,v 1.7 94/06/03 15:58:13 dpw Exp $ */
/**** module flo.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/lut.c b/xc/programs/Xserver/XIE/dixie/request/lut.c
index 7bbc41818..6d51002ea 100644
--- a/xc/programs/Xserver/XIE/dixie/request/lut.c
+++ b/xc/programs/Xserver/XIE/dixie/request/lut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: lut.c,v 1.3 94/01/12 19:56:54 rws Exp $ */
+/* $XConsortium: lut.c,v 1.4 94/04/17 20:33:55 rws Exp $ */
/**** module lut.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/memory.c b/xc/programs/Xserver/XIE/dixie/request/memory.c
index f63e3edb3..7a0f05230 100644
--- a/xc/programs/Xserver/XIE/dixie/request/memory.c
+++ b/xc/programs/Xserver/XIE/dixie/request/memory.c
@@ -1,4 +1,4 @@
-/* $XConsortium: memory.c,v 1.5 94/01/12 19:56:58 rws Exp $ */
+/* $XConsortium: memory.c,v 1.6 94/04/17 20:33:56 rws Exp $ */
/* Module memory.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/photomap.c b/xc/programs/Xserver/XIE/dixie/request/photomap.c
index 2a8497412..172b8a345 100644
--- a/xc/programs/Xserver/XIE/dixie/request/photomap.c
+++ b/xc/programs/Xserver/XIE/dixie/request/photomap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: photomap.c,v 1.5 94/01/12 19:57:03 rws Exp $ */
+/* $XConsortium: photomap.c,v 1.6 94/04/17 20:33:56 rws Exp $ */
/**** module photomap.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/protoflo.c b/xc/programs/Xserver/XIE/dixie/request/protoflo.c
index 93b63fc5d..f066eae26 100644
--- a/xc/programs/Xserver/XIE/dixie/request/protoflo.c
+++ b/xc/programs/Xserver/XIE/dixie/request/protoflo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: protoflo.c,v 1.8 94/04/17 20:33:57 rws Exp $ */
+/* $XConsortium: protoflo.c,v 1.9 94/05/10 13:11:13 dpw Exp $ */
/**** module protoflo.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/roi.c b/xc/programs/Xserver/XIE/dixie/request/roi.c
index 2bb0eca78..d3f0b4dca 100644
--- a/xc/programs/Xserver/XIE/dixie/request/roi.c
+++ b/xc/programs/Xserver/XIE/dixie/request/roi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: roi.c,v 1.3 94/01/12 19:57:16 rws Exp $ */
+/* $XConsortium: roi.c,v 1.4 94/04/17 20:33:58 rws Exp $ */
/**** module roi.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/session.c b/xc/programs/Xserver/XIE/dixie/request/session.c
index 04dd6ea66..f81b0c18c 100644
--- a/xc/programs/Xserver/XIE/dixie/request/session.c
+++ b/xc/programs/Xserver/XIE/dixie/request/session.c
@@ -1,4 +1,4 @@
-/* $XConsortium: session.c,v 1.5 94/04/01 14:07:00 rws Exp $ */
+/* $XConsortium: session.c,v 1.6 94/04/17 20:33:58 rws Exp $ */
/**** session.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/tables.c b/xc/programs/Xserver/XIE/dixie/request/tables.c
index ada2e503a..668cbd6ca 100644
--- a/xc/programs/Xserver/XIE/dixie/request/tables.c
+++ b/xc/programs/Xserver/XIE/dixie/request/tables.c
@@ -1,4 +1,4 @@
-/* $XConsortium: tables.c,v 1.3 94/01/12 19:57:27 rws Exp $ */
+/* $XConsortium: tables.c,v 1.4 94/04/17 20:33:59 rws Exp $ */
/**** tables.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/dixie/request/technq.c b/xc/programs/Xserver/XIE/dixie/request/technq.c
index 0631319fe..462156b72 100644
--- a/xc/programs/Xserver/XIE/dixie/request/technq.c
+++ b/xc/programs/Xserver/XIE/dixie/request/technq.c
@@ -1,4 +1,4 @@
-/* $XConsortium: technq.c,v 1.5 94/01/12 19:57:32 rws Exp $ */
+/* $XConsortium: technq.c,v 1.6 94/04/17 20:34:00 rws Exp $ */
/**** module technq.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/colorlst.h b/xc/programs/Xserver/XIE/include/colorlst.h
index ef89dfaa4..3e89682a3 100644
--- a/xc/programs/Xserver/XIE/include/colorlst.h
+++ b/xc/programs/Xserver/XIE/include/colorlst.h
@@ -1,4 +1,4 @@
-/* $XConsortium: colorlst.h,v 1.3 94/01/12 20:04:27 rws Exp $ */
+/* $XConsortium: colorlst.h,v 1.4 94/04/17 20:34:01 rws Exp $ */
/**** colorlst.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/corex.h b/xc/programs/Xserver/XIE/include/corex.h
index d41e9044f..a88accae4 100644
--- a/xc/programs/Xserver/XIE/include/corex.h
+++ b/xc/programs/Xserver/XIE/include/corex.h
@@ -1,4 +1,4 @@
-/* $XConsortium: corex.h,v 1.4 94/04/01 14:12:29 rws Exp $ */
+/* $XConsortium: corex.h,v 1.5 94/04/17 20:34:01 rws Exp $ */
/**** module corex.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/difloat.h b/xc/programs/Xserver/XIE/include/difloat.h
index 37d4777d1..a943d73ad 100644
--- a/xc/programs/Xserver/XIE/include/difloat.h
+++ b/xc/programs/Xserver/XIE/include/difloat.h
@@ -1,4 +1,4 @@
-/* $XConsortium: difloat.h,v 1.3 94/01/12 20:04:37 rws Exp $ */
+/* $XConsortium: difloat.h,v 1.4 94/04/17 20:34:02 rws Exp $ */
/**** module difloat.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/element.h b/xc/programs/Xserver/XIE/include/element.h
index 9f9ea0856..151b1a5ea 100644
--- a/xc/programs/Xserver/XIE/include/element.h
+++ b/xc/programs/Xserver/XIE/include/element.h
@@ -1,4 +1,4 @@
-/* $XConsortium: element.h,v 1.5 94/04/17 20:34:02 rws Exp $ */
+/* $XConsortium: element.h,v 1.6 94/05/10 13:25:50 dpw Exp $ */
/* module element.h */
/*****************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/error.h b/xc/programs/Xserver/XIE/include/error.h
index 1cb0ae3fa..9265457d1 100644
--- a/xc/programs/Xserver/XIE/include/error.h
+++ b/xc/programs/Xserver/XIE/include/error.h
@@ -1,4 +1,4 @@
-/* $XConsortium: error.h,v 1.3 94/01/12 20:04:48 rws Exp $ */
+/* $XConsortium: error.h,v 1.4 94/04/17 20:34:03 rws Exp $ */
/**** module error.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/flo.h b/xc/programs/Xserver/XIE/include/flo.h
index 6f299c902..4b5ea2005 100644
--- a/xc/programs/Xserver/XIE/include/flo.h
+++ b/xc/programs/Xserver/XIE/include/flo.h
@@ -1,4 +1,4 @@
-/* $XConsortium: flo.h,v 1.3 94/01/12 20:04:53 rws Exp $ */
+/* $XConsortium: flo.h,v 1.4 94/04/17 20:34:03 rws Exp $ */
/**** module flo.h ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/flodata.h b/xc/programs/Xserver/XIE/include/flodata.h
index 54eb6de60..431965d90 100644
--- a/xc/programs/Xserver/XIE/include/flodata.h
+++ b/xc/programs/Xserver/XIE/include/flodata.h
@@ -1,4 +1,4 @@
-/* $XConsortium: flodata.h,v 1.3 94/01/12 20:04:58 rws Exp $ */
+/* $XConsortium: flodata.h,v 1.4 94/04/17 20:34:04 rws Exp $ */
/**** module flodata.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/flostr.h b/xc/programs/Xserver/XIE/include/flostr.h
index a1daf81d1..f0ed95db0 100644
--- a/xc/programs/Xserver/XIE/include/flostr.h
+++ b/xc/programs/Xserver/XIE/include/flostr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: flostr.h,v 1.5 94/04/17 20:34:04 rws Exp dpw $ */
+/* $XConsortium: flostr.h,v 1.6 95/05/18 21:14:49 dpw Exp $ */
/**** module flostr.h ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/lut.h b/xc/programs/Xserver/XIE/include/lut.h
index 913b7dcac..18b9dd785 100644
--- a/xc/programs/Xserver/XIE/include/lut.h
+++ b/xc/programs/Xserver/XIE/include/lut.h
@@ -1,4 +1,4 @@
-/* $XConsortium: lut.h,v 1.3 94/01/12 20:05:09 rws Exp $ */
+/* $XConsortium: lut.h,v 1.4 94/04/17 20:34:05 rws Exp $ */
/**** module lut.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/macro.h b/xc/programs/Xserver/XIE/include/macro.h
index 07a06134f..903523444 100644
--- a/xc/programs/Xserver/XIE/include/macro.h
+++ b/xc/programs/Xserver/XIE/include/macro.h
@@ -1,4 +1,4 @@
-/* $XConsortium: macro.h,v 1.6 94/01/12 20:05:14 rws Exp $ */
+/* $XConsortium: macro.h,v 1.7 94/04/17 20:34:05 rws Exp $ */
/**** module macro.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/memory.h b/xc/programs/Xserver/XIE/include/memory.h
index 79e084774..6e3ec162d 100644
--- a/xc/programs/Xserver/XIE/include/memory.h
+++ b/xc/programs/Xserver/XIE/include/memory.h
@@ -1,4 +1,4 @@
-/* $XConsortium: memory.h,v 1.4 94/01/12 20:05:20 rws Exp $ */
+/* $XConsortium: memory.h,v 1.5 94/04/17 20:34:06 rws Exp $ */
/**** module memory.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/photomap.h b/xc/programs/Xserver/XIE/include/photomap.h
index b54a1c834..68e13f5bd 100644
--- a/xc/programs/Xserver/XIE/include/photomap.h
+++ b/xc/programs/Xserver/XIE/include/photomap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: photomap.h,v 1.4 94/01/12 20:05:24 rws Exp $ */
+/* $XConsortium: photomap.h,v 1.5 94/04/17 20:34:06 rws Exp $ */
/**** module photomap.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/photospc.h b/xc/programs/Xserver/XIE/include/photospc.h
index 08edff23d..489c8a7c1 100644
--- a/xc/programs/Xserver/XIE/include/photospc.h
+++ b/xc/programs/Xserver/XIE/include/photospc.h
@@ -1,4 +1,4 @@
-/* $XConsortium: photospc.h,v 1.3 94/01/12 20:05:29 rws Exp $ */
+/* $XConsortium: photospc.h,v 1.4 94/04/17 20:34:07 rws Exp $ */
/**** module photospc.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/roi.h b/xc/programs/Xserver/XIE/include/roi.h
index b0923b760..66a7239c5 100644
--- a/xc/programs/Xserver/XIE/include/roi.h
+++ b/xc/programs/Xserver/XIE/include/roi.h
@@ -1,4 +1,4 @@
-/* $XConsortium: roi.h,v 1.3 94/01/12 20:05:34 rws Exp $ */
+/* $XConsortium: roi.h,v 1.4 94/04/17 20:34:07 rws Exp $ */
/**** module roi.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/tables.h b/xc/programs/Xserver/XIE/include/tables.h
index 0859319a6..5e1f8a029 100644
--- a/xc/programs/Xserver/XIE/include/tables.h
+++ b/xc/programs/Xserver/XIE/include/tables.h
@@ -1,4 +1,4 @@
-/* $XConsortium: tables.h,v 1.3 94/01/12 20:05:40 rws Exp $ */
+/* $XConsortium: tables.h,v 1.4 94/04/17 20:34:08 rws Exp $ */
/**** module tables.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/include/technq.h b/xc/programs/Xserver/XIE/include/technq.h
index 255e10eed..11532e18a 100644
--- a/xc/programs/Xserver/XIE/include/technq.h
+++ b/xc/programs/Xserver/XIE/include/technq.h
@@ -1,4 +1,4 @@
-/* $XConsortium: technq.h,v 1.3 94/01/12 20:05:45 rws Exp $ */
+/* $XConsortium: technq.h,v 1.4 94/04/17 20:34:08 rws Exp $ */
/**** module technq.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/Imakefile b/xc/programs/Xserver/XIE/mixie/Imakefile
index 1f6cb7539..12b34aa9e 100644
--- a/xc/programs/Xserver/XIE/mixie/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 93/11/07 10:56:56 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.4 94/11/21 18:30:38 kaleb Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/XIE/mixie/control/Imakefile b/xc/programs/Xserver/XIE/mixie/control/Imakefile
index 724b2b6ad..b5c9dc35d 100644
--- a/xc/programs/Xserver/XIE/mixie/control/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/control/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 93/11/06 15:23:41 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/07 10:57:19 rws Exp $
XCOMM build device dependent machine independent control objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/mixie/control/analyze.c b/xc/programs/Xserver/XIE/mixie/control/analyze.c
index afc2550ce..8dd6ae06b 100644
--- a/xc/programs/Xserver/XIE/mixie/control/analyze.c
+++ b/xc/programs/Xserver/XIE/mixie/control/analyze.c
@@ -1,4 +1,4 @@
-/* $XConsortium: analyze.c,v 1.3 94/01/12 20:06:37 rws Exp $ */
+/* $XConsortium: analyze.c,v 1.4 94/04/17 20:34:10 rws Exp $ */
/**** module analyze.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/control/domain.c b/xc/programs/Xserver/XIE/mixie/control/domain.c
index 8782fa16a..23208b9ca 100644
--- a/xc/programs/Xserver/XIE/mixie/control/domain.c
+++ b/xc/programs/Xserver/XIE/mixie/control/domain.c
@@ -1,4 +1,4 @@
-/* $XConsortium: domain.c,v 1.4 94/01/12 20:06:43 rws Exp $ */
+/* $XConsortium: domain.c,v 1.5 94/04/17 20:34:11 rws Exp $ */
/**** module domain.c ****/
/******************************************************************************
Copyright (c) 1993, 1994 X Consortium
diff --git a/xc/programs/Xserver/XIE/mixie/control/floman.c b/xc/programs/Xserver/XIE/mixie/control/floman.c
index 372eb55c4..95b4c4813 100644
--- a/xc/programs/Xserver/XIE/mixie/control/floman.c
+++ b/xc/programs/Xserver/XIE/mixie/control/floman.c
@@ -1,4 +1,4 @@
-/* $XConsortium: floman.c,v 1.5 94/03/22 18:00:36 dpw Exp $ */
+/* $XConsortium: floman.c,v 1.6 94/04/17 20:34:12 dpw Exp $ */
/**** module floman.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/control/sched.c b/xc/programs/Xserver/XIE/mixie/control/sched.c
index 744b95bc9..8a4e19066 100644
--- a/xc/programs/Xserver/XIE/mixie/control/sched.c
+++ b/xc/programs/Xserver/XIE/mixie/control/sched.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sched.c,v 1.3 94/01/12 20:06:54 rws Exp $ */
+/* $XConsortium: sched.c,v 1.4 94/04/17 20:34:12 rws Exp $ */
/**** module sched.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/control/strip.c b/xc/programs/Xserver/XIE/mixie/control/strip.c
index 47c546b93..9b34f6a79 100644
--- a/xc/programs/Xserver/XIE/mixie/control/strip.c
+++ b/xc/programs/Xserver/XIE/mixie/control/strip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: strip.c,v 1.7 94/04/17 20:34:13 rws Exp $ */
+/* $XConsortium: strip.c,v 1.8 94/05/11 18:33:21 dpw Exp $ */
/**** module strip.c ****/
/*****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/Imakefile b/xc/programs/Xserver/XIE/mixie/export/Imakefile
index 2de6808f7..a8e110cc2 100644
--- a/xc/programs/Xserver/XIE/mixie/export/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/export/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 93/11/07 10:57:42 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.5 94/01/12 20:07:25 rws Exp $
XCOMM build device dependent machine independent export element objs
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/mixie/export/mechist.c b/xc/programs/Xserver/XIE/mixie/export/mechist.c
index e436482cf..97f83a034 100644
--- a/xc/programs/Xserver/XIE/mixie/export/mechist.c
+++ b/xc/programs/Xserver/XIE/mixie/export/mechist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mechist.c,v 1.3 94/01/12 20:07:31 rws Exp $ */
+/* $XConsortium: mechist.c,v 1.4 94/04/17 20:34:14 rws Exp $ */
/**** module mechist.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/meclut.c b/xc/programs/Xserver/XIE/mixie/export/meclut.c
index f0b9f7724..ab7aeeeea 100644
--- a/xc/programs/Xserver/XIE/mixie/export/meclut.c
+++ b/xc/programs/Xserver/XIE/mixie/export/meclut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: meclut.c,v 1.5 94/01/12 20:07:38 rws Exp $ */
+/* $XConsortium: meclut.c,v 1.6 94/04/17 20:34:15 rws Exp $ */
/**** module meclut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/mecphoto.c b/xc/programs/Xserver/XIE/mixie/export/mecphoto.c
index ed71b3ade..715d117c4 100644
--- a/xc/programs/Xserver/XIE/mixie/export/mecphoto.c
+++ b/xc/programs/Xserver/XIE/mixie/export/mecphoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mecphoto.c,v 1.8 94/03/13 18:13:59 dpw Exp $ */
+/* $XConsortium: mecphoto.c,v 1.9 94/04/17 20:34:15 dpw Exp $ */
/**** module mecphoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/mecroi.c b/xc/programs/Xserver/XIE/mixie/export/mecroi.c
index cddca4496..c7073b91d 100644
--- a/xc/programs/Xserver/XIE/mixie/export/mecroi.c
+++ b/xc/programs/Xserver/XIE/mixie/export/mecroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mecroi.c,v 1.4 94/01/12 20:07:51 rws Exp $ */
+/* $XConsortium: mecroi.c,v 1.5 94/04/17 20:34:16 rws Exp $ */
/**** module mecroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/medraw.c b/xc/programs/Xserver/XIE/mixie/export/medraw.c
index 42604d64e..eb3e520a7 100644
--- a/xc/programs/Xserver/XIE/mixie/export/medraw.c
+++ b/xc/programs/Xserver/XIE/mixie/export/medraw.c
@@ -1,4 +1,4 @@
-/* $XConsortium: medraw.c,v 1.5 94/01/12 20:07:58 rws Exp $ */
+/* $XConsortium: medraw.c,v 1.6 94/04/17 20:34:17 rws Exp $ */
/**** module medraw.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/medrawp.c b/xc/programs/Xserver/XIE/mixie/export/medrawp.c
index f15f1b609..d122f913e 100644
--- a/xc/programs/Xserver/XIE/mixie/export/medrawp.c
+++ b/xc/programs/Xserver/XIE/mixie/export/medrawp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: medrawp.c,v 1.6 94/01/12 20:08:05 rws Exp $ */
+/* $XConsortium: medrawp.c,v 1.7 94/04/17 20:34:20 rws Exp $ */
/**** module medrawp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/mefax.c b/xc/programs/Xserver/XIE/mixie/export/mefax.c
index fae956f20..dbbad3e0a 100644
--- a/xc/programs/Xserver/XIE/mixie/export/mefax.c
+++ b/xc/programs/Xserver/XIE/mixie/export/mefax.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mefax.c,v 1.6 94/01/18 15:12:58 rws Exp $ */
+/* $XConsortium: mefax.c,v 1.7 94/04/17 20:34:21 rws Exp $ */
/**** module mefax.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/mejpeg.c b/xc/programs/Xserver/XIE/mixie/export/mejpeg.c
index c8d0486d8..761e67626 100644
--- a/xc/programs/Xserver/XIE/mixie/export/mejpeg.c
+++ b/xc/programs/Xserver/XIE/mixie/export/mejpeg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mejpeg.c,v 1.4 94/01/18 15:14:55 rws Exp $ */
+/* $XConsortium: mejpeg.c,v 1.5 94/04/17 20:34:21 rws Exp $ */
/**** module mejpeg.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/melut.c b/xc/programs/Xserver/XIE/mixie/export/melut.c
index 6bb3ad8de..c2613829a 100644
--- a/xc/programs/Xserver/XIE/mixie/export/melut.c
+++ b/xc/programs/Xserver/XIE/mixie/export/melut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: melut.c,v 1.4 94/01/12 20:08:29 rws Exp $ */
+/* $XConsortium: melut.c,v 1.5 94/04/17 20:34:22 rws Exp $ */
/**** module melut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/mephoto.c b/xc/programs/Xserver/XIE/mixie/export/mephoto.c
index 987e037f0..5abde19d5 100644
--- a/xc/programs/Xserver/XIE/mixie/export/mephoto.c
+++ b/xc/programs/Xserver/XIE/mixie/export/mephoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mephoto.c,v 1.6 94/03/13 18:16:02 dpw Exp $ */
+/* $XConsortium: mephoto.c,v 1.7 94/04/17 20:34:23 dpw Exp $ */
/**** module mephoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/meroi.c b/xc/programs/Xserver/XIE/mixie/export/meroi.c
index 8146e0fbb..ccbe457d6 100644
--- a/xc/programs/Xserver/XIE/mixie/export/meroi.c
+++ b/xc/programs/Xserver/XIE/mixie/export/meroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: meroi.c,v 1.3 94/01/12 20:08:42 rws Exp $ */
+/* $XConsortium: meroi.c,v 1.4 94/04/17 20:34:23 rws Exp $ */
/**** module meroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/meuncomp.c b/xc/programs/Xserver/XIE/mixie/export/meuncomp.c
index 99eee1faf..fa4016a32 100644
--- a/xc/programs/Xserver/XIE/mixie/export/meuncomp.c
+++ b/xc/programs/Xserver/XIE/mixie/export/meuncomp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: meuncomp.c,v 1.3 94/01/12 20:08:48 rws Exp $ */
+/* $XConsortium: meuncomp.c,v 1.4 94/04/17 20:34:24 rws Exp $ */
/**** module meuncomp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/export/schoice.c b/xc/programs/Xserver/XIE/mixie/export/schoice.c
index 1574f4835..efe29a389 100644
--- a/xc/programs/Xserver/XIE/mixie/export/schoice.c
+++ b/xc/programs/Xserver/XIE/mixie/export/schoice.c
@@ -1,4 +1,4 @@
-/* $XConsortium: schoice.c,v 1.3 94/02/06 20:03:06 rws Exp $ */
+/* $XConsortium: schoice.c,v 1.4 94/04/17 20:34:25 rws Exp $ */
/**** module schoice.c ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/Imakefile b/xc/programs/Xserver/XIE/mixie/fax/Imakefile
index aab502b44..25a921413 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/fax/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 93/11/06 15:30:03 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/07 10:57:59 rws Exp $
XCOMM build device dependent machine independent fax processing element objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/mixie/fax/bits.h b/xc/programs/Xserver/XIE/mixie/fax/bits.h
index 9e4debaee..84f419cd0 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/bits.h
+++ b/xc/programs/Xserver/XIE/mixie/fax/bits.h
@@ -1,4 +1,4 @@
-/* $XConsortium: bits.h,v 1.4 94/01/12 20:09:13 rws Exp $ */
+/* $XConsortium: bits.h,v 1.5 94/04/17 20:34:26 rws Exp $ */
/**** module fax/bits.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/dg31d.c b/xc/programs/Xserver/XIE/mixie/fax/dg31d.c
index 560851b69..e27c81ebd 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/dg31d.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/dg31d.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dg31d.c,v 1.4 94/01/12 20:09:19 rws Exp $ */
+/* $XConsortium: dg31d.c,v 1.5 94/04/17 20:34:26 rws Exp $ */
/**** module fax/dg31d.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/dg32d.c b/xc/programs/Xserver/XIE/mixie/fax/dg32d.c
index e6c5d0fd2..83bf6b5e4 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/dg32d.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/dg32d.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dg32d.c,v 1.4 94/01/12 20:09:24 rws Exp $ */
+/* $XConsortium: dg32d.c,v 1.5 94/04/17 20:34:27 rws Exp $ */
/**** module fax/dg32d.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/dg4.c b/xc/programs/Xserver/XIE/mixie/fax/dg4.c
index a12f2ff6e..573368a5e 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/dg4.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/dg4.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dg4.c,v 1.3 94/01/12 20:09:30 rws Exp $ */
+/* $XConsortium: dg4.c,v 1.4 94/04/17 20:34:28 rws Exp $ */
/**** module fax/g4.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/dtiff2.c b/xc/programs/Xserver/XIE/mixie/fax/dtiff2.c
index 14958433d..0423a6d1d 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/dtiff2.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/dtiff2.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dtiff2.c,v 1.2 94/01/12 20:09:36 rws Exp $ */
+/* $XConsortium: dtiff2.c,v 1.3 94/04/17 20:34:28 rws Exp $ */
/**** module fax/dtiff2.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/dtiffpb.c b/xc/programs/Xserver/XIE/mixie/fax/dtiffpb.c
index 3fd9e50af..f6e51fe5e 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/dtiffpb.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/dtiffpb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dtiffpb.c,v 1.2 94/01/12 20:09:41 rws Exp $ */
+/* $XConsortium: dtiffpb.c,v 1.3 94/04/17 20:34:29 rws Exp $ */
/**** module fax/tiffpb.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/eg31d.c b/xc/programs/Xserver/XIE/mixie/fax/eg31d.c
index 224c8b4bf..0f8110689 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/eg31d.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/eg31d.c
@@ -1,4 +1,4 @@
-/* $XConsortium: eg31d.c,v 1.2 94/01/12 20:09:47 rws Exp $ */
+/* $XConsortium: eg31d.c,v 1.3 94/04/17 20:34:30 rws Exp $ */
/**** module eg31d.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/eg32d.c b/xc/programs/Xserver/XIE/mixie/fax/eg32d.c
index d1b9a31d0..b322dbae8 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/eg32d.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/eg32d.c
@@ -1,4 +1,4 @@
-/* $XConsortium: eg32d.c,v 1.2 94/01/12 20:09:52 rws Exp $ */
+/* $XConsortium: eg32d.c,v 1.3 94/04/17 20:34:30 rws Exp $ */
/**** module eg32d.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/etiff2.c b/xc/programs/Xserver/XIE/mixie/fax/etiff2.c
index a57bcbd2b..c6ca3a8dc 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/etiff2.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/etiff2.c
@@ -1,4 +1,4 @@
-/* $XConsortium: etiff2.c,v 1.2 94/01/12 20:09:58 rws Exp $ */
+/* $XConsortium: etiff2.c,v 1.3 94/04/17 20:34:31 rws Exp $ */
/**** module etiff2.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/etiffpb.c b/xc/programs/Xserver/XIE/mixie/fax/etiffpb.c
index 33f27e3cc..0db6470c2 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/etiffpb.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/etiffpb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: etiffpb.c,v 1.2 94/01/12 20:10:04 rws Exp $ */
+/* $XConsortium: etiffpb.c,v 1.3 94/04/17 20:34:31 rws Exp $ */
/**** module etiffpb.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/faxint.h b/xc/programs/Xserver/XIE/mixie/fax/faxint.h
index 05096a8b9..0a41a9140 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/faxint.h
+++ b/xc/programs/Xserver/XIE/mixie/fax/faxint.h
@@ -1,4 +1,4 @@
-/* $XConsortium: faxint.h,v 1.3 94/01/12 20:10:10 rws Exp $ */
+/* $XConsortium: faxint.h,v 1.4 94/04/17 20:34:32 rws Exp $ */
/**** module fax/faxint.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/faxtabs.c b/xc/programs/Xserver/XIE/mixie/fax/faxtabs.c
index 66b463f33..3c81d0a7a 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/faxtabs.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/faxtabs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: faxtabs.c,v 1.4 94/02/06 20:03:45 rws Exp $ */
+/* $XConsortium: faxtabs.c,v 1.5 94/04/17 20:34:32 rws Exp $ */
/**** module fax/faxtabs.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/faxtabs.h b/xc/programs/Xserver/XIE/mixie/fax/faxtabs.h
index 9935b15ec..1d35b0800 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/faxtabs.h
+++ b/xc/programs/Xserver/XIE/mixie/fax/faxtabs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: faxtabs.h,v 1.3 94/01/12 20:10:31 rws Exp $ */
+/* $XConsortium: faxtabs.h,v 1.4 94/04/17 20:34:37 rws Exp $ */
/**** module fax/bits.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/fencode.h b/xc/programs/Xserver/XIE/mixie/fax/fencode.h
index fc113d03e..d654942ac 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/fencode.h
+++ b/xc/programs/Xserver/XIE/mixie/fax/fencode.h
@@ -1,4 +1,4 @@
-/* $XConsortium: fencode.h,v 1.3 94/01/12 20:11:05 rws Exp $ */
+/* $XConsortium: fencode.h,v 1.4 94/04/17 20:34:45 rws Exp $ */
/**** module fencode.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/fetabs.h b/xc/programs/Xserver/XIE/mixie/fax/fetabs.h
index 420d16467..f03c15677 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/fetabs.h
+++ b/xc/programs/Xserver/XIE/mixie/fax/fetabs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: fetabs.h,v 1.2 94/01/12 20:11:12 rws Exp $ */
+/* $XConsortium: fetabs.h,v 1.3 94/04/17 20:34:46 rws Exp $ */
/**** module fetabs.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/gbits.h b/xc/programs/Xserver/XIE/mixie/fax/gbits.h
index 8e1e90b0c..b3c2f2f26 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/gbits.h
+++ b/xc/programs/Xserver/XIE/mixie/fax/gbits.h
@@ -1,4 +1,4 @@
-/* $XConsortium: gbits.h,v 1.3 94/01/12 20:11:18 rws Exp $ */
+/* $XConsortium: gbits.h,v 1.4 94/04/17 20:34:47 rws Exp $ */
/**** module fax/gbits.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/fax/zeroeven.c b/xc/programs/Xserver/XIE/mixie/fax/zeroeven.c
index 80e6dcb13..78e3d218e 100644
--- a/xc/programs/Xserver/XIE/mixie/fax/zeroeven.c
+++ b/xc/programs/Xserver/XIE/mixie/fax/zeroeven.c
@@ -1,4 +1,4 @@
-/* $XConsortium: zeroeven.c,v 1.3 94/01/12 20:11:23 rws Exp $ */
+/* $XConsortium: zeroeven.c,v 1.4 94/04/17 20:34:47 rws Exp $ */
/**** module fax/zeroeven.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/Imakefile b/xc/programs/Xserver/XIE/mixie/import/Imakefile
index 191aa6670..2741f47a8 100644
--- a/xc/programs/Xserver/XIE/mixie/import/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/import/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 93/11/06 15:32:19 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/07 10:58:16 rws Exp $
XCOMM build device dependent machine independent import element objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/mixie/import/miclut.c b/xc/programs/Xserver/XIE/mixie/import/miclut.c
index eff482047..ee260a444 100644
--- a/xc/programs/Xserver/XIE/mixie/import/miclut.c
+++ b/xc/programs/Xserver/XIE/mixie/import/miclut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miclut.c,v 1.4 94/01/12 20:11:58 rws Exp $ */
+/* $XConsortium: miclut.c,v 1.5 94/04/17 20:34:48 rws Exp $ */
/**** module miclut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/micphoto.c b/xc/programs/Xserver/XIE/mixie/import/micphoto.c
index 0142329a5..abb77bbbe 100644
--- a/xc/programs/Xserver/XIE/mixie/import/micphoto.c
+++ b/xc/programs/Xserver/XIE/mixie/import/micphoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: micphoto.c,v 1.7 94/03/17 18:57:47 dpw Exp $ */
+/* $XConsortium: micphoto.c,v 1.8 94/04/17 20:34:49 dpw Exp $ */
/**** module micphoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/microi.c b/xc/programs/Xserver/XIE/mixie/import/microi.c
index 21816898e..b4fd27468 100644
--- a/xc/programs/Xserver/XIE/mixie/import/microi.c
+++ b/xc/programs/Xserver/XIE/mixie/import/microi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: microi.c,v 1.5 94/01/12 20:12:12 rws Exp $ */
+/* $XConsortium: microi.c,v 1.6 94/04/17 20:34:50 rws Exp $ */
/**** module microi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/midraw.c b/xc/programs/Xserver/XIE/mixie/import/midraw.c
index ad2118c9b..eeec94079 100644
--- a/xc/programs/Xserver/XIE/mixie/import/midraw.c
+++ b/xc/programs/Xserver/XIE/mixie/import/midraw.c
@@ -1,4 +1,4 @@
-/* $XConsortium: midraw.c,v 1.8 94/01/12 20:12:18 rws Exp $ */
+/* $XConsortium: midraw.c,v 1.9 94/04/17 20:34:52 rws Exp $ */
/**** module midraw.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/mifax.c b/xc/programs/Xserver/XIE/mixie/import/mifax.c
index c6e86ee25..a90f35025 100644
--- a/xc/programs/Xserver/XIE/mixie/import/mifax.c
+++ b/xc/programs/Xserver/XIE/mixie/import/mifax.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mifax.c,v 1.6 94/01/12 20:12:24 rws Exp $ */
+/* $XConsortium: mifax.c,v 1.7 94/04/17 20:34:53 rws Exp $ */
/**** module mifax.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/mijpeg.c b/xc/programs/Xserver/XIE/mixie/import/mijpeg.c
index 9dd67acc7..11ba3ed67 100644
--- a/xc/programs/Xserver/XIE/mixie/import/mijpeg.c
+++ b/xc/programs/Xserver/XIE/mixie/import/mijpeg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mijpeg.c,v 1.3 94/01/12 20:12:31 rws Exp $ */
+/* $XConsortium: mijpeg.c,v 1.4 94/04/17 20:34:54 rws Exp $ */
/**** module mijpeg.c ****/
/******************************************************************************
Copyright (c) 1993, 1994 X Consortium
diff --git a/xc/programs/Xserver/XIE/mixie/import/milut.c b/xc/programs/Xserver/XIE/mixie/import/milut.c
index 0281efc77..2c2397f13 100644
--- a/xc/programs/Xserver/XIE/mixie/import/milut.c
+++ b/xc/programs/Xserver/XIE/mixie/import/milut.c
@@ -1,4 +1,4 @@
-/* $XConsortium: milut.c,v 1.3 94/01/12 20:12:37 rws Exp $ */
+/* $XConsortium: milut.c,v 1.4 94/04/17 20:34:54 rws Exp $ */
/**** module milut.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/miphoto.c b/xc/programs/Xserver/XIE/mixie/import/miphoto.c
index 754c94436..07b81dfa7 100644
--- a/xc/programs/Xserver/XIE/mixie/import/miphoto.c
+++ b/xc/programs/Xserver/XIE/mixie/import/miphoto.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miphoto.c,v 1.6 94/03/17 18:58:31 dpw Exp $ */
+/* $XConsortium: miphoto.c,v 1.7 94/04/17 20:34:55 dpw Exp $ */
/**** module miphoto.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/miregion.c b/xc/programs/Xserver/XIE/mixie/import/miregion.c
index 32dc83a53..065fb70ec 100644
--- a/xc/programs/Xserver/XIE/mixie/import/miregion.c
+++ b/xc/programs/Xserver/XIE/mixie/import/miregion.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miregion.c,v 1.3 94/01/12 20:15:57 rws Exp $ */
+/* $XConsortium: miregion.c,v 1.4 94/04/17 20:34:56 rws Exp $ */
/**** module miregion.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/miroi.c b/xc/programs/Xserver/XIE/mixie/import/miroi.c
index da3ac219d..1efa97865 100644
--- a/xc/programs/Xserver/XIE/mixie/import/miroi.c
+++ b/xc/programs/Xserver/XIE/mixie/import/miroi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miroi.c,v 1.4 94/01/12 20:12:57 rws Exp $ */
+/* $XConsortium: miroi.c,v 1.5 94/04/17 20:34:56 rws Exp $ */
/**** module miroi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/import/miuncomp.c b/xc/programs/Xserver/XIE/mixie/import/miuncomp.c
index 5d310c01b..90aad6cb5 100644
--- a/xc/programs/Xserver/XIE/mixie/import/miuncomp.c
+++ b/xc/programs/Xserver/XIE/mixie/import/miuncomp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miuncomp.c,v 1.3 94/03/13 18:13:30 dpw Exp $ */
+/* $XConsortium: miuncomp.c,v 1.4 94/04/17 20:34:57 dpw Exp $ */
/**** module miuncomp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/domain.h b/xc/programs/Xserver/XIE/mixie/include/domain.h
index a32dfa4c7..ad6f8b7d1 100644
--- a/xc/programs/Xserver/XIE/mixie/include/domain.h
+++ b/xc/programs/Xserver/XIE/mixie/include/domain.h
@@ -1,4 +1,4 @@
-/* $XConsortium: domain.h,v 1.3 94/01/12 20:16:26 rws Exp $ */
+/* $XConsortium: domain.h,v 1.4 94/04/17 20:34:58 rws Exp $ */
/**** module domain.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/fax.h b/xc/programs/Xserver/XIE/mixie/include/fax.h
index 1129340d8..715ca262e 100644
--- a/xc/programs/Xserver/XIE/mixie/include/fax.h
+++ b/xc/programs/Xserver/XIE/mixie/include/fax.h
@@ -1,4 +1,4 @@
-/* $XConsortium: fax.h,v 1.4 94/01/12 20:16:32 rws Exp $ */
+/* $XConsortium: fax.h,v 1.5 94/04/17 20:34:59 rws Exp $ */
/**** module fax.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/floman.h b/xc/programs/Xserver/XIE/mixie/include/floman.h
index 1bbed8b9d..3b299a441 100644
--- a/xc/programs/Xserver/XIE/mixie/include/floman.h
+++ b/xc/programs/Xserver/XIE/mixie/include/floman.h
@@ -1,4 +1,4 @@
-/* $XConsortium: floman.h,v 1.3 94/01/12 20:16:37 rws Exp $ */
+/* $XConsortium: floman.h,v 1.4 94/04/17 20:34:59 rws Exp $ */
/**** module floman.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/jpeg.h b/xc/programs/Xserver/XIE/mixie/include/jpeg.h
index f7de14636..69d63f6d9 100644
--- a/xc/programs/Xserver/XIE/mixie/include/jpeg.h
+++ b/xc/programs/Xserver/XIE/mixie/include/jpeg.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jpeg.h,v 1.2 94/01/12 20:16:42 rws Exp $ */
+/* $XConsortium: jpeg.h,v 1.3 94/04/17 20:35:00 rws Exp $ */
/******************************************************************************
Copyright (c) 1993, 1994 X Consortium
diff --git a/xc/programs/Xserver/XIE/mixie/include/jpegd.h b/xc/programs/Xserver/XIE/mixie/include/jpegd.h
index 77b61d22c..42d237da7 100644
--- a/xc/programs/Xserver/XIE/mixie/include/jpegd.h
+++ b/xc/programs/Xserver/XIE/mixie/include/jpegd.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jpegd.h,v 1.2 94/01/12 20:16:47 rws Exp $ */
+/* $XConsortium: jpegd.h,v 1.3 94/04/17 20:35:00 rws Exp $ */
/******************************************************************************
Copyright (c) 1993, 1994 X Consortium
diff --git a/xc/programs/Xserver/XIE/mixie/include/jpege.h b/xc/programs/Xserver/XIE/mixie/include/jpege.h
index 546a40e7b..232ab1b7e 100644
--- a/xc/programs/Xserver/XIE/mixie/include/jpege.h
+++ b/xc/programs/Xserver/XIE/mixie/include/jpege.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jpege.h,v 1.2 94/01/12 20:16:52 rws Exp $ */
+/* $XConsortium: jpege.h,v 1.3 94/04/17 20:35:01 rws Exp $ */
/******************************************************************************
Copyright (c) 1993, 1994 X Consortium
diff --git a/xc/programs/Xserver/XIE/mixie/include/meuncomp.h b/xc/programs/Xserver/XIE/mixie/include/meuncomp.h
index baae0e757..9742f7ccc 100644
--- a/xc/programs/Xserver/XIE/mixie/include/meuncomp.h
+++ b/xc/programs/Xserver/XIE/mixie/include/meuncomp.h
@@ -1,4 +1,4 @@
-/* $XConsortium: meuncomp.h,v 1.3 94/01/12 20:16:57 rws Exp $ */
+/* $XConsortium: meuncomp.h,v 1.4 94/04/17 20:35:01 rws Exp $ */
/**** module miuncomp.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/microi.h b/xc/programs/Xserver/XIE/mixie/include/microi.h
index 97cd36a26..2819bee8d 100644
--- a/xc/programs/Xserver/XIE/mixie/include/microi.h
+++ b/xc/programs/Xserver/XIE/mixie/include/microi.h
@@ -1,4 +1,4 @@
-/* $XConsortium: microi.h,v 1.3 94/01/12 20:17:03 rws Exp $ */
+/* $XConsortium: microi.h,v 1.4 94/04/17 20:35:02 rws Exp $ */
/**** module microi.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/miphoto.h b/xc/programs/Xserver/XIE/mixie/include/miphoto.h
index 9df033f7d..3bfe11511 100644
--- a/xc/programs/Xserver/XIE/mixie/include/miphoto.h
+++ b/xc/programs/Xserver/XIE/mixie/include/miphoto.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miphoto.h,v 1.3 94/01/12 20:17:08 rws Exp $ */
+/* $XConsortium: miphoto.h,v 1.4 94/04/17 20:35:02 rws Exp $ */
/**** module miphoto.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/miuncomp.h b/xc/programs/Xserver/XIE/mixie/include/miuncomp.h
index f89626d24..b0d746458 100644
--- a/xc/programs/Xserver/XIE/mixie/include/miuncomp.h
+++ b/xc/programs/Xserver/XIE/mixie/include/miuncomp.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miuncomp.h,v 1.3 94/01/12 20:17:13 rws Exp $ */
+/* $XConsortium: miuncomp.h,v 1.4 94/04/17 20:35:03 rws Exp $ */
/**** module miuncomp.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/mpgeom.h b/xc/programs/Xserver/XIE/mixie/include/mpgeom.h
index 58d873ac7..9c3a6184e 100644
--- a/xc/programs/Xserver/XIE/mixie/include/mpgeom.h
+++ b/xc/programs/Xserver/XIE/mixie/include/mpgeom.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mpgeom.h,v 1.4 94/01/12 20:17:18 rws Exp $ */
+/* $XConsortium: mpgeom.h,v 1.5 94/04/17 20:35:03 rws Exp $ */
/**** module mpgeom.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/mppoint.h b/xc/programs/Xserver/XIE/mixie/include/mppoint.h
index 0d5185e3b..6fe25eb16 100644
--- a/xc/programs/Xserver/XIE/mixie/include/mppoint.h
+++ b/xc/programs/Xserver/XIE/mixie/include/mppoint.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mppoint.h,v 1.3 94/01/12 20:17:24 rws Exp $ */
+/* $XConsortium: mppoint.h,v 1.4 94/04/17 20:35:04 rws Exp $ */
/**** module mppoint.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/sched.h b/xc/programs/Xserver/XIE/mixie/include/sched.h
index 2723d0aea..fb5f1a058 100644
--- a/xc/programs/Xserver/XIE/mixie/include/sched.h
+++ b/xc/programs/Xserver/XIE/mixie/include/sched.h
@@ -1,4 +1,4 @@
-/* $XConsortium: sched.h,v 1.3 94/01/12 20:17:28 rws Exp $ */
+/* $XConsortium: sched.h,v 1.4 94/04/17 20:35:04 rws Exp $ */
/**** module sched.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/strip.h b/xc/programs/Xserver/XIE/mixie/include/strip.h
index 8ea8db0d3..95904e109 100644
--- a/xc/programs/Xserver/XIE/mixie/include/strip.h
+++ b/xc/programs/Xserver/XIE/mixie/include/strip.h
@@ -1,4 +1,4 @@
-/* $XConsortium: strip.h,v 1.4 94/01/12 20:17:34 rws Exp $ */
+/* $XConsortium: strip.h,v 1.5 94/04/17 20:35:05 rws Exp $ */
/**** module strip.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/tex.h b/xc/programs/Xserver/XIE/mixie/include/tex.h
index db8a1e534..f186d2be9 100644
--- a/xc/programs/Xserver/XIE/mixie/include/tex.h
+++ b/xc/programs/Xserver/XIE/mixie/include/tex.h
@@ -1,4 +1,4 @@
-/* $XConsortium: tex.h,v 1.3 94/01/12 20:17:39 rws Exp $ */
+/* $XConsortium: tex.h,v 1.4 94/04/17 20:35:06 rws Exp $ */
/**** module tex.h ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/texstr.h b/xc/programs/Xserver/XIE/mixie/include/texstr.h
index 48ffd1db8..8122aa11f 100644
--- a/xc/programs/Xserver/XIE/mixie/include/texstr.h
+++ b/xc/programs/Xserver/XIE/mixie/include/texstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: texstr.h,v 1.5 94/04/17 20:35:06 rws Exp dpw $ */
+/* $XConsortium: texstr.h,v 1.6 95/05/18 21:15:45 dpw Exp $ */
/**** module texstr.h ****/
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/include/xiemd.h b/xc/programs/Xserver/XIE/mixie/include/xiemd.h
index 77c7e7452..0057590dd 100644
--- a/xc/programs/Xserver/XIE/mixie/include/xiemd.h
+++ b/xc/programs/Xserver/XIE/mixie/include/xiemd.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xiemd.h,v 1.6 94/04/01 14:16:25 rws Exp $ */
+/* $XConsortium: xiemd.h,v 1.7 94/04/17 20:35:07 rws Exp $ */
/**** module xiemd.h ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile b/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile
index dc25fd016..40dc802c7 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.7 93/11/01 11:57:38 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.8 93/11/07 10:58:31 rws Exp $
XCOMM build device dependent machine independent fax processing element objects
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/README b/xc/programs/Xserver/XIE/mixie/jpeg/README
index a018cf4e7..1ab0d4d13 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/README
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/README
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: README,v 1.2 93/11/07 10:25:48 rws Exp $ */
The Independent JPEG Group's JPEG software
==========================================
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c
index 96b83bf05..a0a5fa28b 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcdeflts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jcdeflts.c,v 1.3 94/01/12 20:18:12 rws Exp $ */
+/* $XConsortium: jcdeflts.c,v 1.4 94/04/17 20:35:27 rws Exp $ */
/* Module jcdeflts.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcexpand.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcexpand.c
index fbef7f6ea..fafa54ece 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jcexpand.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcexpand.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jcexpand.c,v 1.3 94/01/12 20:18:18 rws Exp $ */
+/* $XConsortium: jcexpand.c,v 1.4 94/04/17 20:35:28 rws Exp $ */
/* Module jcexpand.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jchuff.c b/xc/programs/Xserver/XIE/mixie/jpeg/jchuff.c
index 270b7b993..d36009515 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jchuff.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jchuff.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jchuff.c,v 1.3 94/01/12 20:18:23 rws Exp $ */
+/* $XConsortium: jchuff.c,v 1.4 94/04/17 20:35:29 rws Exp $ */
/* Module jchuff.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcmcu.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcmcu.c
index b73c263e9..c97e92315 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jcmcu.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcmcu.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jcmcu.c,v 1.3 94/01/12 20:18:30 rws Exp $ */
+/* $XConsortium: jcmcu.c,v 1.4 94/04/17 20:35:29 rws Exp $ */
/* Module jcmcu.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h b/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h
index b810d7d7c..42568ee55 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jconfig.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jconfig.h,v 1.3 94/04/01 14:37:05 rws Exp $ */
+/* $XConsortium: jconfig.h,v 1.4 94/04/17 20:35:30 rws Exp $ */
/* Module jconfig.h */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcsample.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcsample.c
index 63bda4bcf..66a4a6e25 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jcsample.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcsample.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jcsample.c,v 1.3 94/01/12 20:18:41 rws Exp $ */
+/* $XConsortium: jcsample.c,v 1.4 94/04/17 20:35:31 rws Exp $ */
/* Module jcsample.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcxie.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcxie.c
index 9ea29c7df..0033464b6 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jcxie.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcxie.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jcxie.c,v 1.3 94/01/12 20:18:48 rws Exp $ */
+/* $XConsortium: jcxie.c,v 1.4 94/04/17 20:35:32 rws Exp $ */
/* Module jcxie.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jcxief.c b/xc/programs/Xserver/XIE/mixie/jpeg/jcxief.c
index e3e20a126..2fcf08d68 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jcxief.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jcxief.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jcxief.c,v 1.3 94/01/12 20:18:54 rws Exp $ */
+/* $XConsortium: jcxief.c,v 1.4 94/04/17 20:35:32 rws Exp $ */
/* Module jcxief.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c
index d127b6f66..ddf80be81 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdbuffer.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdbuffer.c,v 1.3 94/01/12 20:18:59 rws Exp $ */
+/* $XConsortium: jdbuffer.c,v 1.4 94/04/17 20:35:33 rws Exp $ */
/*** jdbuffer.c - transfer data from input strip to decode buffer
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jddeflts.c b/xc/programs/Xserver/XIE/mixie/jpeg/jddeflts.c
index 8837727df..1a1a43ddf 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jddeflts.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jddeflts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jddeflts.c,v 1.3 94/01/12 20:19:05 rws Exp $ */
+/* $XConsortium: jddeflts.c,v 1.4 94/04/17 20:35:34 rws Exp $ */
/* Module jddeflts.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdhuff.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdhuff.c
index 328d90f3d..81b9d2465 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdhuff.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdhuff.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdhuff.c,v 1.3 94/01/12 20:19:11 rws Exp $ */
+/* $XConsortium: jdhuff.c,v 1.4 94/04/17 20:35:34 rws Exp $ */
/* Module jdhuff.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
index 9c5d827b1..17cd810a7 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdlossy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdlossy.c,v 1.3 94/01/12 20:19:17 rws Exp $ */
+/* $XConsortium: jdlossy.c,v 1.4 94/04/17 20:35:35 rws Exp $ */
/* Module jdlossy.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdmcu.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdmcu.c
index 88a0dd865..c389943f7 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdmcu.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdmcu.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdmcu.c,v 1.3 94/01/12 20:19:22 rws Exp $ */
+/* $XConsortium: jdmcu.c,v 1.4 94/04/17 20:35:36 rws Exp $ */
/* Module jdmcu.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdsample.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdsample.c
index a702251f0..3f81f18d6 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdsample.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdsample.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdsample.c,v 1.3 94/01/12 20:19:27 rws Exp $ */
+/* $XConsortium: jdsample.c,v 1.4 94/04/17 20:35:36 rws Exp $ */
/* Module jdsample.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdxie.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdxie.c
index 19c22784f..8f8dea770 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdxie.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdxie.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdxie.c,v 1.3 94/01/12 20:19:34 rws Exp $ */
+/* $XConsortium: jdxie.c,v 1.4 94/04/17 20:35:38 rws Exp $ */
/* Module jdxie.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jdxief.c b/xc/programs/Xserver/XIE/mixie/jpeg/jdxief.c
index 865254a18..c74f9ab04 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jdxief.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jdxief.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jdxief.c,v 1.3 94/01/12 20:19:40 rws Exp $ */
+/* $XConsortium: jdxief.c,v 1.4 94/04/17 20:35:39 rws Exp $ */
/* Module jdxief.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jelossy.c b/xc/programs/Xserver/XIE/mixie/jpeg/jelossy.c
index 5db7de6e6..f41d8bf17 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jelossy.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jelossy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jelossy.c,v 1.3 94/01/12 20:19:46 rws Exp $ */
+/* $XConsortium: jelossy.c,v 1.4 94/04/17 20:35:39 rws Exp $ */
/* Module jelossy.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jfwddct.c b/xc/programs/Xserver/XIE/mixie/jpeg/jfwddct.c
index 77fa55d15..74cd2b45d 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jfwddct.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jfwddct.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jfwddct.c,v 1.3 94/01/12 20:19:51 rws Exp $ */
+/* $XConsortium: jfwddct.c,v 1.4 94/04/17 20:35:40 rws Exp $ */
/* Module jfwddct.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h b/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h
index 7d5b47d6d..f6bf5feac 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jinclude.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jinclude.h,v 1.5 94/01/12 20:19:57 rws Exp $ */
+/* $XConsortium: jinclude.h,v 1.6 94/04/17 20:35:40 rws Exp $ */
/* Module jinclude.h */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c b/xc/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c
index a2b41fdb0..3f31874c1 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jmemmgr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jmemmgr.c,v 1.3 94/01/12 20:20:03 rws Exp $ */
+/* $XConsortium: jmemmgr.c,v 1.4 94/04/17 20:35:41 rws Exp $ */
/* Module jmemmgr.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c b/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c
index bdbca1f2e..753f9ed32 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jmemsys.c,v 1.3 94/01/12 20:20:11 rws Exp $ */
+/* $XConsortium: jmemsys.c,v 1.4 94/04/17 20:35:42 rws Exp $ */
/* Module jmemsys.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.h b/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.h
index 07ba2ca6f..dfe5b4c40 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.h
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jmemsys.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jmemsys.h,v 1.3 94/01/12 20:20:16 rws Exp $ */
+/* $XConsortium: jmemsys.h,v 1.4 94/04/17 20:35:43 rws Exp $ */
/* Module jmemsys.h */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jpegdata.h b/xc/programs/Xserver/XIE/mixie/jpeg/jpegdata.h
index 9476ba6dc..292d34ac8 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jpegdata.h
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jpegdata.h
@@ -1,4 +1,4 @@
-/* $XConsortium: jpegdata.h,v 1.3 94/01/12 20:20:22 rws Exp $ */
+/* $XConsortium: jpegdata.h,v 1.4 94/04/17 20:35:43 rws Exp $ */
/* Module jpegdata.h */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c b/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c
index 95d1207df..540783558 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jrdjfif.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jrdjfif.c,v 1.3 94/01/12 20:20:30 rws Exp $ */
+/* $XConsortium: jrdjfif.c,v 1.4 94/04/17 20:35:44 rws Exp $ */
/* Module jrdjfif.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jrevdct.c b/xc/programs/Xserver/XIE/mixie/jpeg/jrevdct.c
index 1978d21f7..4ae15e576 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jrevdct.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jrevdct.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jrevdct.c,v 1.3 94/01/12 20:20:37 rws Exp $ */
+/* $XConsortium: jrevdct.c,v 1.4 94/04/17 20:35:45 rws Exp $ */
/* Module jrevdct.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jutils.c b/xc/programs/Xserver/XIE/mixie/jpeg/jutils.c
index 74c8cb786..a773728d7 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jutils.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jutils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jutils.c,v 1.3 94/01/12 20:20:43 rws Exp $ */
+/* $XConsortium: jutils.c,v 1.4 94/04/17 20:35:46 rws Exp $ */
/* Module jutils.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c b/xc/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c
index d488958e5..d49319217 100644
--- a/xc/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c
+++ b/xc/programs/Xserver/XIE/mixie/jpeg/jwrjfif.c
@@ -1,4 +1,4 @@
-/* $XConsortium: jwrjfif.c,v 1.3 94/01/12 20:20:49 rws Exp $ */
+/* $XConsortium: jwrjfif.c,v 1.4 94/04/17 20:35:46 rws Exp $ */
/* Module jwrjfif.c */
/****************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/Imakefile b/xc/programs/Xserver/XIE/mixie/process/Imakefile
index 39585ca4c..2f29e0464 100644
--- a/xc/programs/Xserver/XIE/mixie/process/Imakefile
+++ b/xc/programs/Xserver/XIE/mixie/process/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 93/11/06 15:37:27 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 93/11/07 10:58:48 rws Exp $
XCOMM build device dependent machine independent process element objs
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/XIE/mixie/process/bitfun.c b/xc/programs/Xserver/XIE/mixie/process/bitfun.c
index e5b81dc01..678bfc097 100644
--- a/xc/programs/Xserver/XIE/mixie/process/bitfun.c
+++ b/xc/programs/Xserver/XIE/mixie/process/bitfun.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bitfun.c,v 1.4 94/01/12 20:21:09 rws Exp $ */
+/* $XConsortium: bitfun.c,v 1.5 94/04/17 20:35:08 rws Exp $ */
/**** module bitfun.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mparith.c b/xc/programs/Xserver/XIE/mixie/process/mparith.c
index 5328ca889..d069b22dd 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mparith.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mparith.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mparith.c,v 1.4 94/01/12 20:21:16 rws Exp $ */
+/* $XConsortium: mparith.c,v 1.5 94/04/17 20:35:09 rws Exp $ */
/**** module mparith.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpbandc.c b/xc/programs/Xserver/XIE/mixie/process/mpbandc.c
index 48ae584ee..3d0e59736 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpbandc.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpbandc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpbandc.c,v 1.4 94/01/12 20:21:24 rws Exp $ */
+/* $XConsortium: mpbandc.c,v 1.5 94/04/17 20:35:10 rws Exp $ */
/**** module mpbandc.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpbande.c b/xc/programs/Xserver/XIE/mixie/process/mpbande.c
index acbb11d56..e8c2c61f2 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpbande.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpbande.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpbande.c,v 1.4 94/01/12 20:21:30 rws Exp $ */
+/* $XConsortium: mpbande.c,v 1.5 94/04/17 20:35:10 rws Exp $ */
/**** module mpbande.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpbands.c b/xc/programs/Xserver/XIE/mixie/process/mpbands.c
index 153323ec6..d24e06a22 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpbands.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpbands.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpbands.c,v 1.3 94/01/12 20:21:37 rws Exp $ */
+/* $XConsortium: mpbands.c,v 1.4 94/04/17 20:35:11 rws Exp $ */
/**** module mpbands.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpblend.c b/xc/programs/Xserver/XIE/mixie/process/mpblend.c
index b9a0b9c43..1452ae6b1 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpblend.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpblend.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpblend.c,v 1.4 94/01/12 20:21:42 rws Exp $ */
+/* $XConsortium: mpblend.c,v 1.5 94/04/17 20:35:12 rws Exp $ */
/**** module mpblend.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c b/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c
index 525cd98fb..811b11dcf 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpcfromi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpcfromi.c,v 1.4 94/01/12 20:21:49 rws Exp $ */
+/* $XConsortium: mpcfromi.c,v 1.5 94/04/17 20:35:13 rws Exp $ */
/**** module mpcfromi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpcnst.c b/xc/programs/Xserver/XIE/mixie/process/mpcnst.c
index 3b8a1a94a..5e22c4a19 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpcnst.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpcnst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpcnst.c,v 1.4 94/01/12 20:21:55 rws Exp $ */
+/* $XConsortium: mpcnst.c,v 1.5 94/04/17 20:35:13 rws Exp $ */
/**** module mpcnst.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpcomp.c b/xc/programs/Xserver/XIE/mixie/process/mpcomp.c
index c892aef1b..bf159fa65 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpcomp.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpcomp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpcomp.c,v 1.3 94/01/12 20:22:04 rws Exp $ */
+/* $XConsortium: mpcomp.c,v 1.4 94/04/17 20:35:14 rws Exp $ */
/**** module mpcomp.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpconv.c b/xc/programs/Xserver/XIE/mixie/process/mpconv.c
index 0e9e2de7a..73793b4b3 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpconv.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpconv.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpconv.c,v 1.4 94/01/12 20:22:15 rws Exp $ */
+/* $XConsortium: mpconv.c,v 1.5 94/04/17 20:35:15 rws Exp $ */
/**** module mpconv.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpctoi.c b/xc/programs/Xserver/XIE/mixie/process/mpctoi.c
index 780e5d888..d70f52269 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpctoi.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpctoi.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpctoi.c,v 1.6 94/04/17 20:35:16 rws Exp $ */
+/* $XConsortium: mpctoi.c,v 1.7 94/05/10 13:27:17 dpw Exp $ */
/**** module mpctoi.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpdither.c b/xc/programs/Xserver/XIE/mixie/process/mpdither.c
index 8f0e7ad80..7943eb6f3 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpdither.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpdither.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpdither.c,v 1.4 94/01/12 20:22:27 rws Exp $ */
+/* $XConsortium: mpdither.c,v 1.5 94/04/17 20:35:17 rws Exp $ */
/**** module mpdither.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpgeom.c b/xc/programs/Xserver/XIE/mixie/process/mpgeom.c
index a757783b8..31d8d8463 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpgeom.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpgeom.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpgeom.c,v 1.3 94/01/12 20:22:32 rws Exp $ */
+/* $XConsortium: mpgeom.c,v 1.4 94/04/17 20:35:18 rws Exp $ */
/**** module mpgeom.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c b/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c
index 412df4628..fbc0b4c0d 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpgeomaa.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpgeomaa.c,v 1.7 94/01/12 20:22:38 rws Exp $ */
+/* $XConsortium: mpgeomaa.c,v 1.8 94/04/17 20:35:18 rws Exp $ */
/**** module mpgeomaa.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c b/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c
index 6882d514e..6563532ce 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpgeomnn.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpgeomnn.c,v 1.6 94/03/06 20:06:53 rws Exp $ */
+/* $XConsortium: mpgeomnn.c,v 1.7 94/04/17 20:35:19 rws Exp $ */
/**** module mpgeomnn.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mphist.c b/xc/programs/Xserver/XIE/mixie/process/mphist.c
index c02d95bd0..851bea020 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mphist.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mphist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mphist.c,v 1.3 94/01/12 20:22:51 rws Exp $ */
+/* $XConsortium: mphist.c,v 1.4 94/04/17 20:35:20 rws Exp $ */
/**** module mphist.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mplogic.c b/xc/programs/Xserver/XIE/mixie/process/mplogic.c
index 0184a8ffa..cb086fba8 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mplogic.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mplogic.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mplogic.c,v 1.7 94/01/12 20:22:57 rws Exp $ */
+/* $XConsortium: mplogic.c,v 1.8 94/04/17 20:35:21 rws Exp $ */
/**** module mplogic.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mppaste.c b/xc/programs/Xserver/XIE/mixie/process/mppaste.c
index 8c9556438..fc6e05023 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mppaste.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mppaste.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mppaste.c,v 1.5 94/02/03 18:23:18 rws Exp $ */
+/* $XConsortium: mppaste.c,v 1.6 94/04/17 20:35:21 rws Exp $ */
/**** module mppaste.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mppoint.c b/xc/programs/Xserver/XIE/mixie/process/mppoint.c
index 5485fb4c0..28bffcae6 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mppoint.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mppoint.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mppoint.c,v 1.4 94/01/12 20:23:09 rws Exp $ */
+/* $XConsortium: mppoint.c,v 1.5 94/04/17 20:35:25 rws Exp $ */
/**** module mppoint.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mprgb.c b/xc/programs/Xserver/XIE/mixie/process/mprgb.c
index 7418a21fd..1773aa176 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mprgb.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mprgb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mprgb.c,v 1.5 94/01/19 17:10:03 rws Exp $ */
+/* $XConsortium: mprgb.c,v 1.6 94/04/17 20:35:25 rws Exp $ */
/**** module mprgb.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c b/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c
index 6bc48cc86..fb99ad598 100644
--- a/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c
+++ b/xc/programs/Xserver/XIE/mixie/process/mpuncnst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mpuncnst.c,v 1.4 94/01/12 20:23:26 rws Exp $ */
+/* $XConsortium: mpuncnst.c,v 1.5 94/04/17 20:35:26 rws Exp $ */
/**** module mpuncnst.c ****/
/******************************************************************************
diff --git a/xc/programs/Xserver/Xext/Imakefile b/xc/programs/Xserver/Xext/Imakefile
index 331819a29..5a2fe4f0c 100644
--- a/xc/programs/Xserver/Xext/Imakefile
+++ b/xc/programs/Xserver/Xext/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.39 94/11/21 18:30:11 kaleb Exp dpw $
+XCOMM $XConsortium: Imakefile,v 5.40 95/05/18 21:18:53 dpw Exp $
#include <Server.tmpl>
#if HasShm
diff --git a/xc/programs/Xserver/Xext/bigreq.c b/xc/programs/Xserver/Xext/bigreq.c
index ab46690ff..f5a9ac338 100644
--- a/xc/programs/Xserver/Xext/bigreq.c
+++ b/xc/programs/Xserver/Xext/bigreq.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bigreq.c,v 1.3 92/11/07 16:57:09 rws Exp $ */
+/* $XConsortium: bigreq.c,v 1.4 94/04/17 20:32:51 rws Exp $ */
/*
Copyright (c) 1992 X Consortium
diff --git a/xc/programs/Xserver/Xext/mbuf.c b/xc/programs/Xserver/Xext/mbuf.c
index eca1e0359..a9cfd32c4 100644
--- a/xc/programs/Xserver/Xext/mbuf.c
+++ b/xc/programs/Xserver/Xext/mbuf.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: mbuf.c,v 1.23 94/04/01 17:33:15 dpw Exp $ */
+/* $XConsortium: mbuf.c,v 1.24 94/04/17 20:32:52 dpw Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
#include <stdio.h>
diff --git a/xc/programs/Xserver/Xext/mbufbf.c b/xc/programs/Xserver/Xext/mbufbf.c
index 105d3f2fa..fcbe70f34 100644
--- a/xc/programs/Xserver/Xext/mbufbf.c
+++ b/xc/programs/Xserver/Xext/mbufbf.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: mbufbf.c,v 1.4 94/02/23 15:52:25 dpw Exp $ */
+/* $XConsortium: mbufbf.c,v 1.5 94/04/17 20:32:53 dpw Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/xc/programs/Xserver/Xext/mbufpx.c b/xc/programs/Xserver/Xext/mbufpx.c
index 3141434c5..ec737cd97 100644
--- a/xc/programs/Xserver/Xext/mbufpx.c
+++ b/xc/programs/Xserver/Xext/mbufpx.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: mbufpx.c,v 1.4 94/01/07 09:46:17 dpw Exp $ */
+/* $XConsortium: mbufpx.c,v 1.5 94/04/17 20:32:54 dpw Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
#include <stdio.h>
diff --git a/xc/programs/Xserver/Xext/mitmisc.c b/xc/programs/Xserver/Xext/mitmisc.c
index acbb45481..169b81b62 100644
--- a/xc/programs/Xserver/Xext/mitmisc.c
+++ b/xc/programs/Xserver/Xext/mitmisc.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium.
/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */
-/* $XConsortium: mitmisc.c,v 1.4 91/06/17 11:36:15 rws Exp $ */
+/* $XConsortium: mitmisc.c,v 1.5 94/04/17 20:32:54 rws Exp $ */
#include "X.h"
#include "Xproto.h"
diff --git a/xc/programs/Xserver/Xext/shape.c b/xc/programs/Xserver/Xext/shape.c
index 9e35feac4..adf0b163a 100644
--- a/xc/programs/Xserver/Xext/shape.c
+++ b/xc/programs/Xserver/Xext/shape.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: shape.c,v 5.21 94/04/17 20:32:55 rws Exp dpw $ */
+/* $XConsortium: shape.c,v 5.22 94/09/22 20:58:37 dpw Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
#include <stdio.h>
diff --git a/xc/programs/Xserver/Xext/shm.c b/xc/programs/Xserver/Xext/shm.c
index e840914de..9b6fd5efe 100644
--- a/xc/programs/Xserver/Xext/shm.c
+++ b/xc/programs/Xserver/Xext/shm.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium.
/* THIS IS NOT AN X CONSORTIUM STANDARD */
-/* $XConsortium: shm.c,v 1.24 94/11/02 16:01:56 kaleb Exp dpw $ */
+/* $XConsortium: shm.c,v 1.25 95/04/06 16:00:55 dpw Exp $ */
#include <sys/types.h>
#include <sys/ipc.h>
diff --git a/xc/programs/Xserver/Xext/sleepuntil.c b/xc/programs/Xserver/Xext/sleepuntil.c
index e9a8c84ae..72df9ce06 100644
--- a/xc/programs/Xserver/Xext/sleepuntil.c
+++ b/xc/programs/Xserver/Xext/sleepuntil.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: sleepuntil.c,v 1.4 94/04/01 17:42:02 dpw Exp $
+ * $XConsortium: sleepuntil.c,v 1.5 94/04/17 20:32:57 dpw Exp $
*
Copyright (c) 1992 X Consortium
diff --git a/xc/programs/Xserver/Xext/sync.c b/xc/programs/Xserver/Xext/sync.c
index f275e0204..050813c1c 100644
--- a/xc/programs/Xserver/Xext/sync.c
+++ b/xc/programs/Xserver/Xext/sync.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sync.c,v 1.9 94/03/31 09:23:30 dpw Exp $ */
+/* $XConsortium: sync.c,v 1.10 94/04/17 20:32:58 dpw Exp $ */
/*
Copyright (c) 1991, 1993 X Consortium
diff --git a/xc/programs/Xserver/Xext/xcmisc.c b/xc/programs/Xserver/Xext/xcmisc.c
index 59edda25a..6a37d81e0 100644
--- a/xc/programs/Xserver/Xext/xcmisc.c
+++ b/xc/programs/Xserver/Xext/xcmisc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xcmisc.c,v 1.3 94/03/25 16:39:59 dpw Exp $ */
+/* $XConsortium: xcmisc.c,v 1.4 94/04/17 20:32:59 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/Xext/xtest.c b/xc/programs/Xserver/Xext/xtest.c
index c1cae693e..7cab23bee 100644
--- a/xc/programs/Xserver/Xext/xtest.c
+++ b/xc/programs/Xserver/Xext/xtest.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xtest.c,v 1.21 94/04/01 17:40:37 dpw Exp $ */
+/* $XConsortium: xtest.c,v 1.22 94/04/17 20:32:59 dpw Exp $ */
/*
Copyright (c) 1992 X Consortium
diff --git a/xc/programs/Xserver/Xext/xtest1dd.c b/xc/programs/Xserver/Xext/xtest1dd.c
index 20ba49522..c618cffe2 100644
--- a/xc/programs/Xserver/Xext/xtest1dd.c
+++ b/xc/programs/Xserver/Xext/xtest1dd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xtest1dd.c,v 1.13 94/03/28 18:29:22 gildea Exp $ */
+/* $XConsortium: xtest1dd.c,v 1.14 94/04/17 20:33:00 gildea Exp $ */
/*
* File: xtest1dd.c
*
diff --git a/xc/programs/Xserver/Xext/xtest1di.c b/xc/programs/Xserver/Xext/xtest1di.c
index e5ee96d2a..a2af18470 100644
--- a/xc/programs/Xserver/Xext/xtest1di.c
+++ b/xc/programs/Xserver/Xext/xtest1di.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xtest1di.c,v 1.12 94/04/02 12:35:17 rws Exp $ */
+/* $XConsortium: xtest1di.c,v 1.13 94/04/17 20:33:01 rws Exp $ */
/*
* File: xtest1di.c
*
diff --git a/xc/programs/Xserver/Xi/Imakefile b/xc/programs/Xserver/Xi/Imakefile
index f12391513..398b4c558 100644
--- a/xc/programs/Xserver/Xi/Imakefile
+++ b/xc/programs/Xserver/Xi/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 93/09/04 17:15:51 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.7 93/09/04 19:10:21 rws Exp $
#include <Server.tmpl>
SRCS = allowev.c \
diff --git a/xc/programs/Xserver/Xi/allowev.c b/xc/programs/Xserver/Xi/allowev.c
index 4ae6533c1..a1664cffc 100644
--- a/xc/programs/Xserver/Xi/allowev.c
+++ b/xc/programs/Xserver/Xi/allowev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: allowev.c,v 1.7 92/11/14 10:46:28 rws Exp $ */
+/* $XConsortium: allowev.c,v 1.8 94/04/17 20:33:02 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/chgdctl.c b/xc/programs/Xserver/Xi/chgdctl.c
index 2c267d871..ecaa38aca 100644
--- a/xc/programs/Xserver/Xi/chgdctl.c
+++ b/xc/programs/Xserver/Xi/chgdctl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chgdctl.c,v 1.3 93/07/08 15:16:44 rws Exp $ */
+/* $XConsortium: chgdctl.c,v 1.4 94/04/17 20:33:02 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/chgfctl.c b/xc/programs/Xserver/Xi/chgfctl.c
index 2d1688fae..1a330578e 100644
--- a/xc/programs/Xserver/Xi/chgfctl.c
+++ b/xc/programs/Xserver/Xi/chgfctl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chgfctl.c,v 1.15 92/11/14 10:46:55 rws Exp $ */
+/* $XConsortium: chgfctl.c,v 1.16 94/04/17 20:33:03 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/chgkbd.c b/xc/programs/Xserver/Xi/chgkbd.c
index 72a2699bf..94fb795fb 100644
--- a/xc/programs/Xserver/Xi/chgkbd.c
+++ b/xc/programs/Xserver/Xi/chgkbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chgkbd.c,v 1.19 93/07/12 09:39:09 dpw Exp $ */
+/* $XConsortium: chgkbd.c,v 1.20 94/04/17 20:33:04 dpw Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/chgkmap.c b/xc/programs/Xserver/Xi/chgkmap.c
index e852b027a..5fc0e3642 100644
--- a/xc/programs/Xserver/Xi/chgkmap.c
+++ b/xc/programs/Xserver/Xi/chgkmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chgkmap.c,v 1.6 92/11/14 10:47:02 rws Exp $ */
+/* $XConsortium: chgkmap.c,v 1.7 94/04/17 20:33:04 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/chgprop.c b/xc/programs/Xserver/Xi/chgprop.c
index 87a572578..8eb6bfae5 100644
--- a/xc/programs/Xserver/Xi/chgprop.c
+++ b/xc/programs/Xserver/Xi/chgprop.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chgprop.c,v 1.11 92/11/14 10:47:05 rws Exp $ */
+/* $XConsortium: chgprop.c,v 1.12 94/04/17 20:33:05 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/chgptr.c b/xc/programs/Xserver/Xi/chgptr.c
index cf079b0dd..8160568e1 100644
--- a/xc/programs/Xserver/Xi/chgptr.c
+++ b/xc/programs/Xserver/Xi/chgptr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chgptr.c,v 1.19 93/07/12 09:39:18 dpw Exp $ */
+/* $XConsortium: chgptr.c,v 1.20 94/04/17 20:33:05 dpw Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/closedev.c b/xc/programs/Xserver/Xi/closedev.c
index dac0072d7..bbd419ce6 100644
--- a/xc/programs/Xserver/Xi/closedev.c
+++ b/xc/programs/Xserver/Xi/closedev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: closedev.c,v 1.11 92/11/14 10:47:11 rws Exp $ */
+/* $XConsortium: closedev.c,v 1.12 94/04/17 20:33:06 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/devbell.c b/xc/programs/Xserver/Xi/devbell.c
index 1a4462399..a5ce53528 100644
--- a/xc/programs/Xserver/Xi/devbell.c
+++ b/xc/programs/Xserver/Xi/devbell.c
@@ -1,4 +1,4 @@
-/* $XConsortium: devbell.c,v 1.3 92/10/20 17:11:39 rws Exp $ */
+/* $XConsortium: devbell.c,v 1.4 94/04/17 20:33:07 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/exevents.c b/xc/programs/Xserver/Xi/exevents.c
index fba43e8ab..ab0832f28 100644
--- a/xc/programs/Xserver/Xi/exevents.c
+++ b/xc/programs/Xserver/Xi/exevents.c
@@ -1,4 +1,4 @@
-/* $XConsortium: exevents.c,v 1.49 94/02/23 16:03:52 dpw Exp $ */
+/* $XConsortium: exevents.c,v 1.50 94/04/17 20:33:07 dpw Exp $ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/Xi/extinit.c b/xc/programs/Xserver/Xi/extinit.c
index 8db9fb66d..c1221ee95 100644
--- a/xc/programs/Xserver/Xi/extinit.c
+++ b/xc/programs/Xserver/Xi/extinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: extinit.c,v 1.17 94/02/07 23:52:51 rws Exp $ */
+/* $XConsortium: extinit.c,v 1.18 94/04/17 20:33:08 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getbmap.c b/xc/programs/Xserver/Xi/getbmap.c
index c93770fab..41cc48420 100644
--- a/xc/programs/Xserver/Xi/getbmap.c
+++ b/xc/programs/Xserver/Xi/getbmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getbmap.c,v 1.5 93/07/08 15:30:43 rws Exp $ */
+/* $XConsortium: getbmap.c,v 1.6 94/04/17 20:33:09 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getdctl.c b/xc/programs/Xserver/Xi/getdctl.c
index 38b688612..3e75ea4b6 100644
--- a/xc/programs/Xserver/Xi/getdctl.c
+++ b/xc/programs/Xserver/Xi/getdctl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getdctl.c,v 1.3 93/07/08 15:29:24 rws Exp $ */
+/* $XConsortium: getdctl.c,v 1.4 94/04/17 20:33:09 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getfctl.c b/xc/programs/Xserver/Xi/getfctl.c
index a50493078..758293127 100644
--- a/xc/programs/Xserver/Xi/getfctl.c
+++ b/xc/programs/Xserver/Xi/getfctl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getfctl.c,v 1.15 93/07/08 15:29:50 rws Exp $ */
+/* $XConsortium: getfctl.c,v 1.16 94/04/17 20:33:10 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getfocus.c b/xc/programs/Xserver/Xi/getfocus.c
index 0e36bb52c..7feafddb6 100644
--- a/xc/programs/Xserver/Xi/getfocus.c
+++ b/xc/programs/Xserver/Xi/getfocus.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getfocus.c,v 1.6 93/07/08 15:30:21 rws Exp $ */
+/* $XConsortium: getfocus.c,v 1.7 94/04/17 20:33:11 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getkmap.c b/xc/programs/Xserver/Xi/getkmap.c
index e479989ea..75dbb9c34 100644
--- a/xc/programs/Xserver/Xi/getkmap.c
+++ b/xc/programs/Xserver/Xi/getkmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getkmap.c,v 1.6 93/07/08 15:31:10 rws Exp $ */
+/* $XConsortium: getkmap.c,v 1.7 94/04/17 20:33:11 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getmmap.c b/xc/programs/Xserver/Xi/getmmap.c
index 80c60ef94..87de74f88 100644
--- a/xc/programs/Xserver/Xi/getmmap.c
+++ b/xc/programs/Xserver/Xi/getmmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getmmap.c,v 1.5 93/07/08 15:31:35 rws Exp $ */
+/* $XConsortium: getmmap.c,v 1.6 94/04/17 20:33:12 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getprop.c b/xc/programs/Xserver/Xi/getprop.c
index 2ae136d1d..c0ae4701f 100644
--- a/xc/programs/Xserver/Xi/getprop.c
+++ b/xc/programs/Xserver/Xi/getprop.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getprop.c,v 1.10 93/07/08 15:31:56 rws Exp $ */
+/* $XConsortium: getprop.c,v 1.11 94/04/17 20:33:12 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/getselev.c b/xc/programs/Xserver/Xi/getselev.c
index e747dfc32..ee83902b1 100644
--- a/xc/programs/Xserver/Xi/getselev.c
+++ b/xc/programs/Xserver/Xi/getselev.c
@@ -45,7 +45,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: getselev.c,v 1.11 93/07/08 15:32:30 rws Exp $ */
+/* $XConsortium: getselev.c,v 1.12 94/04/17 20:33:13 rws Exp $ */
/***********************************************************************
*
diff --git a/xc/programs/Xserver/Xi/getvers.c b/xc/programs/Xserver/Xi/getvers.c
index 388dc4ab2..2c4c5a5a3 100644
--- a/xc/programs/Xserver/Xi/getvers.c
+++ b/xc/programs/Xserver/Xi/getvers.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getvers.c,v 1.7 93/07/08 15:32:54 rws Exp $ */
+/* $XConsortium: getvers.c,v 1.8 94/04/17 20:33:13 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/grabdev.c b/xc/programs/Xserver/Xi/grabdev.c
index af7b8c33e..4dbcfcff2 100644
--- a/xc/programs/Xserver/Xi/grabdev.c
+++ b/xc/programs/Xserver/Xi/grabdev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: grabdev.c,v 1.13 93/07/08 15:39:30 rws Exp $ */
+/* $XConsortium: grabdev.c,v 1.14 94/04/17 20:33:14 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/grabdevb.c b/xc/programs/Xserver/Xi/grabdevb.c
index 6669e559a..a3ed9e000 100644
--- a/xc/programs/Xserver/Xi/grabdevb.c
+++ b/xc/programs/Xserver/Xi/grabdevb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: grabdevb.c,v 1.11 92/11/14 10:47:30 rws Exp $ */
+/* $XConsortium: grabdevb.c,v 1.12 94/04/17 20:33:14 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/grabdevk.c b/xc/programs/Xserver/Xi/grabdevk.c
index 6c5f7ac9b..f4bf4d66d 100644
--- a/xc/programs/Xserver/Xi/grabdevk.c
+++ b/xc/programs/Xserver/Xi/grabdevk.c
@@ -1,4 +1,4 @@
-/* $XConsortium: grabdevk.c,v 1.10 92/11/14 10:47:33 rws Exp $ */
+/* $XConsortium: grabdevk.c,v 1.11 94/04/17 20:33:15 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/gtmotion.c b/xc/programs/Xserver/Xi/gtmotion.c
index 255e059fb..af2b5ca73 100644
--- a/xc/programs/Xserver/Xi/gtmotion.c
+++ b/xc/programs/Xserver/Xi/gtmotion.c
@@ -1,4 +1,4 @@
-/* $XConsortium: gtmotion.c,v 1.14 93/07/08 15:39:02 rws Exp $ */ /*ALLOC-FIX*/
+/* $XConsortium: gtmotion.c,v 1.15 94/04/17 20:33:15 rws Exp $ */ /*ALLOC-FIX*/
/************************************************************
diff --git a/xc/programs/Xserver/Xi/listdev.c b/xc/programs/Xserver/Xi/listdev.c
index 5d10f8a35..8d3d0b860 100644
--- a/xc/programs/Xserver/Xi/listdev.c
+++ b/xc/programs/Xserver/Xi/listdev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: listdev.c,v 1.17 93/07/08 15:39:53 rws Exp $ */
+/* $XConsortium: listdev.c,v 1.18 94/04/17 20:33:18 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/opendev.c b/xc/programs/Xserver/Xi/opendev.c
index 7f1e7ad0b..5bb6a67b2 100644
--- a/xc/programs/Xserver/Xi/opendev.c
+++ b/xc/programs/Xserver/Xi/opendev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: opendev.c,v 1.12 93/07/08 15:40:27 rws Exp $ */
+/* $XConsortium: opendev.c,v 1.13 94/04/17 20:33:19 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/queryst.c b/xc/programs/Xserver/Xi/queryst.c
index cd1d47cba..d28ac31a8 100644
--- a/xc/programs/Xserver/Xi/queryst.c
+++ b/xc/programs/Xserver/Xi/queryst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: queryst.c,v 1.12 94/04/12 17:27:37 dpw Exp $ */
+/* $XConsortium: queryst.c,v 1.13 94/04/17 20:33:19 dpw Exp $ */
/*
Copyright (c) 1998 X Consortium
diff --git a/xc/programs/Xserver/Xi/selectev.c b/xc/programs/Xserver/Xi/selectev.c
index 4dd443c21..7c8d6d95d 100644
--- a/xc/programs/Xserver/Xi/selectev.c
+++ b/xc/programs/Xserver/Xi/selectev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: selectev.c,v 1.10 92/11/14 10:47:39 rws Exp $ */
+/* $XConsortium: selectev.c,v 1.11 94/04/17 20:33:20 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/sendexev.c b/xc/programs/Xserver/Xi/sendexev.c
index c062cbcea..fdbe239cc 100644
--- a/xc/programs/Xserver/Xi/sendexev.c
+++ b/xc/programs/Xserver/Xi/sendexev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sendexev.c,v 1.8 92/11/14 10:47:42 rws Exp $ */
+/* $XConsortium: sendexev.c,v 1.9 94/04/17 20:33:20 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/setbmap.c b/xc/programs/Xserver/Xi/setbmap.c
index a58c4a55d..6fae8b605 100644
--- a/xc/programs/Xserver/Xi/setbmap.c
+++ b/xc/programs/Xserver/Xi/setbmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: setbmap.c,v 1.7 93/07/08 15:41:42 rws Exp $ */
+/* $XConsortium: setbmap.c,v 1.8 94/04/17 20:33:21 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/setdval.c b/xc/programs/Xserver/Xi/setdval.c
index 5aece2437..556f2e46d 100644
--- a/xc/programs/Xserver/Xi/setdval.c
+++ b/xc/programs/Xserver/Xi/setdval.c
@@ -1,4 +1,4 @@
-/* $XConsortium: setdval.c,v 1.3 93/07/08 15:40:50 rws Exp $ */
+/* $XConsortium: setdval.c,v 1.4 94/04/17 20:33:21 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/setfocus.c b/xc/programs/Xserver/Xi/setfocus.c
index 2c2a4103a..55eaf7ad8 100644
--- a/xc/programs/Xserver/Xi/setfocus.c
+++ b/xc/programs/Xserver/Xi/setfocus.c
@@ -1,4 +1,4 @@
-/* $XConsortium: setfocus.c,v 1.6 92/11/14 10:47:45 rws Exp $ */
+/* $XConsortium: setfocus.c,v 1.7 94/04/17 20:33:22 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/setmmap.c b/xc/programs/Xserver/Xi/setmmap.c
index f1aa7bf25..e91823bf6 100644
--- a/xc/programs/Xserver/Xi/setmmap.c
+++ b/xc/programs/Xserver/Xi/setmmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: setmmap.c,v 1.8 93/07/08 15:42:07 rws Exp $ */
+/* $XConsortium: setmmap.c,v 1.9 94/04/17 20:33:22 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/setmode.c b/xc/programs/Xserver/Xi/setmode.c
index 1f336f529..fe5fdc622 100644
--- a/xc/programs/Xserver/Xi/setmode.c
+++ b/xc/programs/Xserver/Xi/setmode.c
@@ -1,4 +1,4 @@
-/* $XConsortium: setmode.c,v 1.11 93/07/08 15:41:20 rws Exp $ */
+/* $XConsortium: setmode.c,v 1.12 94/04/17 20:33:23 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/stubs.c b/xc/programs/Xserver/Xi/stubs.c
index 60016fa3c..84dbf5551 100644
--- a/xc/programs/Xserver/Xi/stubs.c
+++ b/xc/programs/Xserver/Xi/stubs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: stubs.c,v 1.9 94/04/17 20:33:23 rws Exp $ */
+/* $XConsortium: stubs.c,v 1.10 94/07/18 16:25:03 gildea Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/ungrdev.c b/xc/programs/Xserver/Xi/ungrdev.c
index 15849e402..7c685856e 100644
--- a/xc/programs/Xserver/Xi/ungrdev.c
+++ b/xc/programs/Xserver/Xi/ungrdev.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ungrdev.c,v 1.7 92/11/14 10:47:47 rws Exp $ */
+/* $XConsortium: ungrdev.c,v 1.8 94/04/17 20:33:24 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/ungrdevb.c b/xc/programs/Xserver/Xi/ungrdevb.c
index 7c4dbc586..6055f21f8 100644
--- a/xc/programs/Xserver/Xi/ungrdevb.c
+++ b/xc/programs/Xserver/Xi/ungrdevb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ungrdevb.c,v 1.9 92/11/14 10:47:50 rws Exp $ */
+/* $XConsortium: ungrdevb.c,v 1.10 94/04/17 20:33:24 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xi/ungrdevk.c b/xc/programs/Xserver/Xi/ungrdevk.c
index cd835bb2c..8c10babec 100644
--- a/xc/programs/Xserver/Xi/ungrdevk.c
+++ b/xc/programs/Xserver/Xi/ungrdevk.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ungrdevk.c,v 1.9 92/11/14 10:47:53 rws Exp $ */
+/* $XConsortium: ungrdevk.c,v 1.10 94/04/17 20:33:25 rws Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/Xserver.man b/xc/programs/Xserver/Xserver.man
index c7cda3786..8fe63a891 100644
--- a/xc/programs/Xserver/Xserver.man
+++ b/xc/programs/Xserver/Xserver.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: Xserver.man,v 1.54 94/04/17 20:25:23 dpw Exp $
+.\" $XConsortium: Xserver.man,v 1.55 94/05/16 12:19:55 dpw Exp $
.\" Copyright (c) 1984 - 1991, 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/Xserver/cfb/Imakefile b/xc/programs/Xserver/cfb/Imakefile
index bf66cbe94..d0f2f1f11 100644
--- a/xc/programs/Xserver/cfb/Imakefile
+++ b/xc/programs/Xserver/cfb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.42 94/11/21 18:29:57 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.43 95/04/07 19:13:59 kaleb Exp $
#include <Server.tmpl>
#ifndef PixelSize
diff --git a/xc/programs/Xserver/cfb/cfb.h b/xc/programs/Xserver/cfb/cfb.h
index 6fbe49e3a..9760bc5bf 100644
--- a/xc/programs/Xserver/cfb/cfb.h
+++ b/xc/programs/Xserver/cfb/cfb.h
@@ -1,4 +1,4 @@
-/* $XConsortium: cfb.h,v 5.36 94/03/11 17:48:35 dpw Exp $ */
+/* $XConsortium: cfb.h,v 5.37 94/04/17 20:28:38 dpw Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/cfb/cfb8bit.c b/xc/programs/Xserver/cfb/cfb8bit.c
index bc2279f50..47725428d 100644
--- a/xc/programs/Xserver/cfb/cfb8bit.c
+++ b/xc/programs/Xserver/cfb/cfb8bit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfb8bit.c,v 1.12 94/04/17 20:28:39 dpw Exp dpw $ */
+/* $XConsortium: cfb8bit.c,v 1.13 94/09/29 20:33:11 dpw Exp $ */
/*
Copyright (c) 1989, 1994 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfb8bit.h b/xc/programs/Xserver/cfb/cfb8bit.h
index c2b6f94c9..0ddd2271d 100644
--- a/xc/programs/Xserver/cfb/cfb8bit.h
+++ b/xc/programs/Xserver/cfb/cfb8bit.h
@@ -34,7 +34,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: cfb8bit.h,v 1.17 94/09/29 20:33:11 dpw Exp kaleb $ */
+/* $XConsortium: cfb8bit.h,v 1.18 95/04/07 18:59:27 kaleb Exp $ */
#include "servermd.h"
diff --git a/xc/programs/Xserver/cfb/cfb8cppl.c b/xc/programs/Xserver/cfb/cfb8cppl.c
index e0f8bbf30..0b5a9e6dc 100644
--- a/xc/programs/Xserver/cfb/cfb8cppl.c
+++ b/xc/programs/Xserver/cfb/cfb8cppl.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfb8cppl.c,v 1.14 94/01/21 22:07:30 dpw Exp $
+ * $XConsortium: cfb8cppl.c,v 1.15 94/04/17 20:28:41 dpw Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfb8line.c b/xc/programs/Xserver/cfb/cfb8line.c
index cc74e717d..66261edb3 100644
--- a/xc/programs/Xserver/cfb/cfb8line.c
+++ b/xc/programs/Xserver/cfb/cfb8line.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfb8line.c,v 1.29 94/07/28 14:38:16 dpw Exp $
+ * $XConsortium: cfb8line.c,v 1.30 95/01/03 15:28:30 dpw Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfballpriv.c b/xc/programs/Xserver/cfb/cfballpriv.c
index e490f5c1e..0ad48b08b 100644
--- a/xc/programs/Xserver/cfb/cfballpriv.c
+++ b/xc/programs/Xserver/cfb/cfballpriv.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfballpriv.c,v 1.4 93/12/13 17:21:41 dpw Exp $
+ * $XConsortium: cfballpriv.c,v 1.5 94/04/17 20:28:42 dpw Exp $
*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbbitblt.c b/xc/programs/Xserver/cfb/cfbbitblt.c
index 6b309ee7b..cc78882d9 100644
--- a/xc/programs/Xserver/cfb/cfbbitblt.c
+++ b/xc/programs/Xserver/cfb/cfbbitblt.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from the X Consortium.
Author: Keith Packard
*/
-/* $XConsortium: cfbbitblt.c,v 5.50 94/04/17 20:28:43 dpw Exp $ */
+/* $XConsortium: cfbbitblt.c,v 5.51 94/05/27 11:00:56 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbblt.c b/xc/programs/Xserver/cfb/cfbblt.c
index 9aa3150e8..c784d95ab 100644
--- a/xc/programs/Xserver/cfb/cfbblt.c
+++ b/xc/programs/Xserver/cfb/cfbblt.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from the X Consortium.
Author: Keith Packard
*/
-/* $XConsortium: cfbblt.c,v 1.12 93/12/13 17:21:45 dpw Exp $ */
+/* $XConsortium: cfbblt.c,v 1.13 94/04/17 20:28:44 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbbres.c b/xc/programs/Xserver/cfb/cfbbres.c
index eda9fd04f..61d21b578 100644
--- a/xc/programs/Xserver/cfb/cfbbres.c
+++ b/xc/programs/Xserver/cfb/cfbbres.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbbres.c,v 1.14 94/03/06 18:20:23 dpw Exp $ */
+/* $XConsortium: cfbbres.c,v 1.15 94/04/17 20:28:45 dpw Exp $ */
#include "X.h"
#include "misc.h"
#include "cfb.h"
diff --git a/xc/programs/Xserver/cfb/cfbbresd.c b/xc/programs/Xserver/cfb/cfbbresd.c
index 597353eed..e1cb49e87 100644
--- a/xc/programs/Xserver/cfb/cfbbresd.c
+++ b/xc/programs/Xserver/cfb/cfbbresd.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbbresd.c,v 1.15 94/03/06 18:20:27 dpw Exp $ */
+/* $XConsortium: cfbbresd.c,v 1.16 94/04/17 20:28:45 dpw Exp $ */
#include "X.h"
#include "misc.h"
#include "cfb.h"
diff --git a/xc/programs/Xserver/cfb/cfbbstore.c b/xc/programs/Xserver/cfb/cfbbstore.c
index 052e3d0ba..022a04853 100644
--- a/xc/programs/Xserver/cfb/cfbbstore.c
+++ b/xc/programs/Xserver/cfb/cfbbstore.c
@@ -16,7 +16,7 @@
*/
#ifndef lint
static char rcsid[] =
-"$XConsortium: cfbbstore.c,v 5.7 93/10/12 11:22:42 dpw Exp $ SPRITE (Berkeley)";
+"$XConsortium: cfbbstore.c,v 5.8 93/12/13 17:21:51 dpw Exp $ SPRITE (Berkeley)";
#endif
#include "cfb.h"
diff --git a/xc/programs/Xserver/cfb/cfbcmap.c b/xc/programs/Xserver/cfb/cfbcmap.c
index 1d8d2c74a..39079d66c 100644
--- a/xc/programs/Xserver/cfb/cfbcmap.c
+++ b/xc/programs/Xserver/cfb/cfbcmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbcmap.c,v 4.18 94/02/09 11:23:49 dpw Exp $ */
+/* $XConsortium: cfbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/cfb/cfbfillarc.c b/xc/programs/Xserver/cfb/cfbfillarc.c
index 97022b53e..d1efb57bc 100644
--- a/xc/programs/Xserver/cfb/cfbfillarc.c
+++ b/xc/programs/Xserver/cfb/cfbfillarc.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: cfbfillarc.c,v 5.14 94/01/07 09:42:15 dpw Exp $ */
+/* $XConsortium: cfbfillarc.c,v 5.15 94/04/17 20:28:47 dpw Exp $ */
#include "X.h"
#include "Xprotostr.h"
diff --git a/xc/programs/Xserver/cfb/cfbfillrct.c b/xc/programs/Xserver/cfb/cfbfillrct.c
index c9f6f4b25..bdc2fdd9d 100644
--- a/xc/programs/Xserver/cfb/cfbfillrct.c
+++ b/xc/programs/Xserver/cfb/cfbfillrct.c
@@ -28,7 +28,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: cfbfillrct.c,v 5.17 94/01/07 09:42:18 dpw Exp $ */
+/* $XConsortium: cfbfillrct.c,v 5.18 94/04/17 20:28:47 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbfillsp.c b/xc/programs/Xserver/cfb/cfbfillsp.c
index fd506e44a..bc009d413 100644
--- a/xc/programs/Xserver/cfb/cfbfillsp.c
+++ b/xc/programs/Xserver/cfb/cfbfillsp.c
@@ -75,7 +75,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbfillsp.c,v 5.23 94/02/23 15:51:16 dpw Exp $ */
+/* $XConsortium: cfbfillsp.c,v 5.24 94/04/17 20:28:48 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbgc.c b/xc/programs/Xserver/cfb/cfbgc.c
index f51798780..c2f996a64 100644
--- a/xc/programs/Xserver/cfb/cfbgc.c
+++ b/xc/programs/Xserver/cfb/cfbgc.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbgc.c,v 5.61 94/03/06 18:20:30 dpw Exp $ */
+/* $XConsortium: cfbgc.c,v 5.62 94/04/17 20:28:49 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbgetsp.c b/xc/programs/Xserver/cfb/cfbgetsp.c
index 2675b3c95..0ce9fc6a2 100644
--- a/xc/programs/Xserver/cfb/cfbgetsp.c
+++ b/xc/programs/Xserver/cfb/cfbgetsp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbgetsp.c,v 5.13 93/12/13 17:22:02 dpw Exp $ */
+/* $XConsortium: cfbgetsp.c,v 5.14 94/04/17 20:28:50 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbglblt8.c b/xc/programs/Xserver/cfb/cfbglblt8.c
index 554212be6..f6f2c9eef 100644
--- a/xc/programs/Xserver/cfb/cfbglblt8.c
+++ b/xc/programs/Xserver/cfb/cfbglblt8.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbglblt8.c,v 5.30 94/01/07 09:42:21 dpw Exp $ */
+/* $XConsortium: cfbglblt8.c,v 5.31 94/04/17 20:28:51 dpw Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbhrzvert.c b/xc/programs/Xserver/cfb/cfbhrzvert.c
index a04e99bd3..55e8104cd 100644
--- a/xc/programs/Xserver/cfb/cfbhrzvert.c
+++ b/xc/programs/Xserver/cfb/cfbhrzvert.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbhrzvert.c,v 1.7 93/12/13 17:22:05 dpw Exp $ */
+/* $XConsortium: cfbhrzvert.c,v 1.8 94/04/17 20:28:51 dpw Exp $ */
#include "X.h"
#include "gc.h"
diff --git a/xc/programs/Xserver/cfb/cfbigblt8.c b/xc/programs/Xserver/cfb/cfbigblt8.c
index a5368f5dd..db2478137 100644
--- a/xc/programs/Xserver/cfb/cfbigblt8.c
+++ b/xc/programs/Xserver/cfb/cfbigblt8.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfbigblt8.c,v 1.8 93/12/13 17:22:07 dpw Exp $
+ * $XConsortium: cfbigblt8.c,v 1.9 94/04/17 20:28:52 dpw Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbimage.c b/xc/programs/Xserver/cfb/cfbimage.c
index 4c7ec121a..21ef2d2c3 100644
--- a/xc/programs/Xserver/cfb/cfbimage.c
+++ b/xc/programs/Xserver/cfb/cfbimage.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbimage.c,v 1.17 94/01/21 22:07:26 dpw Exp $ */
+/* $XConsortium: cfbimage.c,v 1.18 94/04/17 20:28:52 dpw Exp $ */
#include "X.h"
#include "windowstr.h"
diff --git a/xc/programs/Xserver/cfb/cfbline.c b/xc/programs/Xserver/cfb/cfbline.c
index b5f18f489..1b77c84c2 100644
--- a/xc/programs/Xserver/cfb/cfbline.c
+++ b/xc/programs/Xserver/cfb/cfbline.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cfbline.c,v 1.23 94/04/17 20:28:53 dpw Exp $ */
+/* $XConsortium: cfbline.c,v 1.24 94/07/28 14:33:33 dpw Exp $ */
#include "X.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/cfb/cfbmap.h b/xc/programs/Xserver/cfb/cfbmap.h
index cde696667..d597bdb19 100644
--- a/xc/programs/Xserver/cfb/cfbmap.h
+++ b/xc/programs/Xserver/cfb/cfbmap.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfbmap.h,v 1.10 94/09/22 21:12:06 dpw Exp gildea $
+ * $XConsortium: cfbmap.h,v 1.11 95/06/08 23:20:39 gildea Exp $
*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbmskbits.c b/xc/programs/Xserver/cfb/cfbmskbits.c
index 87ba2d0ea..932b7f331 100644
--- a/xc/programs/Xserver/cfb/cfbmskbits.c
+++ b/xc/programs/Xserver/cfb/cfbmskbits.c
@@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XConsortium: cfbmskbits.c,v 4.12 94/04/17 20:28:54 dpw Exp $ */
+/* $XConsortium: cfbmskbits.c,v 4.13 94/07/28 12:30:41 dpw Exp $ */
/*
* ==========================================================================
diff --git a/xc/programs/Xserver/cfb/cfbmskbits.h b/xc/programs/Xserver/cfb/cfbmskbits.h
index b027f25dc..d8b38f814 100644
--- a/xc/programs/Xserver/cfb/cfbmskbits.h
+++ b/xc/programs/Xserver/cfb/cfbmskbits.h
@@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XConsortium: cfbmskbits.h,v 4.24 94/01/12 17:56:22 dpw Exp $ */
+/* $XConsortium: cfbmskbits.h,v 4.25 94/04/17 20:28:55 dpw Exp $ */
/* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */
#include "X.h"
diff --git a/xc/programs/Xserver/cfb/cfbpixmap.c b/xc/programs/Xserver/cfb/cfbpixmap.c
index b04c39862..951f58315 100644
--- a/xc/programs/Xserver/cfb/cfbpixmap.c
+++ b/xc/programs/Xserver/cfb/cfbpixmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbpixmap.c,v 5.13 94/03/11 17:13:21 dpw Exp $ */
+/* $XConsortium: cfbpixmap.c,v 5.14 94/04/17 20:28:56 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbply1rct.c b/xc/programs/Xserver/cfb/cfbply1rct.c
index 89131d4b8..cf568303e 100644
--- a/xc/programs/Xserver/cfb/cfbply1rct.c
+++ b/xc/programs/Xserver/cfb/cfbply1rct.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfbply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp kaleb $
+ * $XConsortium: cfbply1rct.c,v 1.15 94/11/21 18:29:57 kaleb Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbpntwin.c b/xc/programs/Xserver/cfb/cfbpntwin.c
index a44364d07..938f6b956 100644
--- a/xc/programs/Xserver/cfb/cfbpntwin.c
+++ b/xc/programs/Xserver/cfb/cfbpntwin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbpntwin.c,v 5.17 93/12/13 17:22:20 dpw Exp $ */
+/* $XConsortium: cfbpntwin.c,v 5.18 94/04/17 20:28:57 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbpolypnt.c b/xc/programs/Xserver/cfb/cfbpolypnt.c
index 047178f79..5fa9244f2 100644
--- a/xc/programs/Xserver/cfb/cfbpolypnt.c
+++ b/xc/programs/Xserver/cfb/cfbpolypnt.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: cfbpolypnt.c,v 5.16 94/03/16 16:53:04 dpw Exp $ */
+/* $XConsortium: cfbpolypnt.c,v 5.17 94/04/17 20:28:57 dpw Exp $ */
#include "X.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/cfb/cfbpush8.c b/xc/programs/Xserver/cfb/cfbpush8.c
index 5702d6b02..646699b9b 100644
--- a/xc/programs/Xserver/cfb/cfbpush8.c
+++ b/xc/programs/Xserver/cfb/cfbpush8.c
@@ -27,7 +27,7 @@ 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.
*/
-/* $XConsortium: cfbpush8.c,v 5.13 94/01/07 09:42:27 dpw Exp $ */
+/* $XConsortium: cfbpush8.c,v 5.14 94/04/17 20:28:58 dpw Exp $ */
#if PSZ == 8
diff --git a/xc/programs/Xserver/cfb/cfbrctstp8.c b/xc/programs/Xserver/cfb/cfbrctstp8.c
index 92c83d8ae..11c498156 100644
--- a/xc/programs/Xserver/cfb/cfbrctstp8.c
+++ b/xc/programs/Xserver/cfb/cfbrctstp8.c
@@ -30,7 +30,7 @@ Author: Keith Packard, MIT X Consortium
*/
-/* $XConsortium: cfbrctstp8.c,v 1.16 93/12/13 17:22:25 dpw Exp $ */
+/* $XConsortium: cfbrctstp8.c,v 1.17 94/04/17 20:28:59 dpw Exp $ */
#if PSZ == 8
diff --git a/xc/programs/Xserver/cfb/cfbrrop.c b/xc/programs/Xserver/cfb/cfbrrop.c
index 742bad149..d49cba249 100644
--- a/xc/programs/Xserver/cfb/cfbrrop.c
+++ b/xc/programs/Xserver/cfb/cfbrrop.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfbrrop.c,v 1.7 94/03/11 17:33:49 dpw Exp $
+ * $XConsortium: cfbrrop.c,v 1.8 94/04/17 20:28:59 dpw Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbrrop.h b/xc/programs/Xserver/cfb/cfbrrop.h
index 5feb594e4..8eac477b5 100644
--- a/xc/programs/Xserver/cfb/cfbrrop.h
+++ b/xc/programs/Xserver/cfb/cfbrrop.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfbrrop.h,v 1.9 94/04/17 20:29:00 dpw Exp gildea $
+ * $XConsortium: cfbrrop.h,v 1.10 95/06/08 23:20:39 gildea Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbscrinit.c b/xc/programs/Xserver/cfb/cfbscrinit.c
index fb778c3dc..a54aa9780 100644
--- a/xc/programs/Xserver/cfb/cfbscrinit.c
+++ b/xc/programs/Xserver/cfb/cfbscrinit.c
@@ -26,7 +26,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XConsortium: cfbscrinit.c,v 5.31 94/04/11 14:23:19 dpw Exp $ */
+/* $XConsortium: cfbscrinit.c,v 5.32 94/04/17 20:29:00 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbsetsp.c b/xc/programs/Xserver/cfb/cfbsetsp.c
index 63eac53f3..1ea12cdbf 100644
--- a/xc/programs/Xserver/cfb/cfbsetsp.c
+++ b/xc/programs/Xserver/cfb/cfbsetsp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbsetsp.c,v 5.9 94/03/18 16:07:03 dpw Exp $ */
+/* $XConsortium: cfbsetsp.c,v 5.10 94/04/17 20:29:01 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbsolid.c b/xc/programs/Xserver/cfb/cfbsolid.c
index 9d9804e95..131995439 100644
--- a/xc/programs/Xserver/cfb/cfbsolid.c
+++ b/xc/programs/Xserver/cfb/cfbsolid.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cfbsolid.c,v 1.8 94/02/23 15:51:26 dpw Exp $
+ * $XConsortium: cfbsolid.c,v 1.9 94/04/17 20:29:02 dpw Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbteblt8.c b/xc/programs/Xserver/cfb/cfbteblt8.c
index b68d450a3..b30a82166 100644
--- a/xc/programs/Xserver/cfb/cfbteblt8.c
+++ b/xc/programs/Xserver/cfb/cfbteblt8.c
@@ -29,7 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: cfbteblt8.c,v 5.23 94/04/17 20:29:02 dpw Exp $ */
+/* $XConsortium: cfbteblt8.c,v 5.24 94/09/29 15:26:00 dpw Exp $ */
#if PSZ == 8
diff --git a/xc/programs/Xserver/cfb/cfbtegblt.c b/xc/programs/Xserver/cfb/cfbtegblt.c
index ee78c9f0e..bf442670b 100644
--- a/xc/programs/Xserver/cfb/cfbtegblt.c
+++ b/xc/programs/Xserver/cfb/cfbtegblt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbtegblt.c,v 5.8 94/01/07 09:42:33 dpw Exp $ */
+/* $XConsortium: cfbtegblt.c,v 5.9 94/04/17 20:29:03 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbtile32.c b/xc/programs/Xserver/cfb/cfbtile32.c
index e807b5629..75c6c1856 100644
--- a/xc/programs/Xserver/cfb/cfbtile32.c
+++ b/xc/programs/Xserver/cfb/cfbtile32.c
@@ -29,7 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: cfbtile32.c,v 1.7 94/02/23 15:51:28 dpw Exp $ */
+/* $XConsortium: cfbtile32.c,v 1.8 94/04/17 20:29:05 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbtileodd.c b/xc/programs/Xserver/cfb/cfbtileodd.c
index 99f9c699f..75463f933 100644
--- a/xc/programs/Xserver/cfb/cfbtileodd.c
+++ b/xc/programs/Xserver/cfb/cfbtileodd.c
@@ -29,7 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: cfbtileodd.c,v 1.15 93/12/13 17:22:39 dpw Exp $ */
+/* $XConsortium: cfbtileodd.c,v 1.16 94/04/17 20:29:06 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbwindow.c b/xc/programs/Xserver/cfb/cfbwindow.c
index 35b7ffc2e..bc854a570 100644
--- a/xc/programs/Xserver/cfb/cfbwindow.c
+++ b/xc/programs/Xserver/cfb/cfbwindow.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbwindow.c,v 5.21 94/03/22 16:56:29 dpw Exp $ */
+/* $XConsortium: cfbwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/cfb/cfbzerarc.c b/xc/programs/Xserver/cfb/cfbzerarc.c
index 4c8b31acf..6fb864b0b 100644
--- a/xc/programs/Xserver/cfb/cfbzerarc.c
+++ b/xc/programs/Xserver/cfb/cfbzerarc.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: cfbzerarc.c,v 5.21 94/01/07 09:42:39 dpw Exp $ */
+/* $XConsortium: cfbzerarc.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */
/* Derived from:
* "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
diff --git a/xc/programs/Xserver/cfb/stip68kgnu.h b/xc/programs/Xserver/cfb/stip68kgnu.h
index c9f0925a5..4f9461401 100644
--- a/xc/programs/Xserver/cfb/stip68kgnu.h
+++ b/xc/programs/Xserver/cfb/stip68kgnu.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: stip68kgnu.h,v 1.2 93/12/13 17:22:44 dpw Exp $
+ * $XConsortium: stip68kgnu.h,v 1.3 94/04/17 20:29:08 dpw Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/stipmips.s b/xc/programs/Xserver/cfb/stipmips.s
index 730e545bf..e67e8c34f 100644
--- a/xc/programs/Xserver/cfb/stipmips.s
+++ b/xc/programs/Xserver/cfb/stipmips.s
@@ -1,5 +1,5 @@
/*
- * $XConsortium: stipmips.s,v 1.9 91/12/19 14:17:31 keith Exp $
+ * $XConsortium: stipmips.s,v 1.10 94/04/17 20:29:08 keith Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/stipple68k.s b/xc/programs/Xserver/cfb/stipple68k.s
index 24821fb57..be801bb3e 100644
--- a/xc/programs/Xserver/cfb/stipple68k.s
+++ b/xc/programs/Xserver/cfb/stipple68k.s
@@ -1,5 +1,5 @@
/*
- * $XConsortium: stipple68k.s,v 1.2 91/12/19 14:17:34 keith Exp $
+ * $XConsortium: stipple68k.s,v 1.3 94/04/17 20:29:09 keith Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/stipsparc.s b/xc/programs/Xserver/cfb/stipsparc.s
index 60537a171..b69418ac2 100644
--- a/xc/programs/Xserver/cfb/stipsparc.s
+++ b/xc/programs/Xserver/cfb/stipsparc.s
@@ -1,5 +1,5 @@
/*
- * $XConsortium: stipsparc.s,v 1.8 92/11/20 13:41:30 rws Exp $
+ * $XConsortium: stipsparc.s,v 1.9 94/04/17 20:29:09 rws Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb/stipsprc32.s b/xc/programs/Xserver/cfb/stipsprc32.s
index 8d2b4f7ac..80c41519a 100644
--- a/xc/programs/Xserver/cfb/stipsprc32.s
+++ b/xc/programs/Xserver/cfb/stipsprc32.s
@@ -1,5 +1,5 @@
/*
- * $XConsortium: stipsprc32.s,v 1.2 92/11/20 13:42:48 rws Exp $
+ * $XConsortium: stipsprc32.s,v 1.3 94/04/17 20:29:10 rws Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/cfb16/Imakefile b/xc/programs/Xserver/cfb16/Imakefile
index bdc1a8499..3cd230409 100644
--- a/xc/programs/Xserver/cfb16/Imakefile
+++ b/xc/programs/Xserver/cfb16/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.0 91/12/19 18:24:00 keith Exp $
+XCOMM $XConsortium: Imakefile,v 1.1 91/12/28 13:32:27 rws Exp $
#define PixelSize 16
#define LinkDirectory ../cfb
diff --git a/xc/programs/Xserver/cfb32/Imakefile b/xc/programs/Xserver/cfb32/Imakefile
index 8b6e71f07..ca7a0a7f2 100644
--- a/xc/programs/Xserver/cfb32/Imakefile
+++ b/xc/programs/Xserver/cfb32/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.0 91/12/19 18:24:00 keith Exp $
+XCOMM $XConsortium: Imakefile,v 1.1 91/12/28 13:32:46 rws Exp $
#define PixelSize 32
#define LinkDirectory ../cfb
diff --git a/xc/programs/Xserver/dbe/Imakefile b/xc/programs/Xserver/dbe/Imakefile
index c949ec509..acefec4e1 100644
--- a/xc/programs/Xserver/dbe/Imakefile
+++ b/xc/programs/Xserver/dbe/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.40 95/05/18 21:18:53 dpw Exp $
+XCOMM $XConsortium: Imakefile,v 1.1 95/05/31 13:19:27 dpw Exp $
#include <Server.tmpl>
SRCS = dbe.c midbe.c
diff --git a/xc/programs/Xserver/dbe/dbe.c b/xc/programs/Xserver/dbe/dbe.c
index ffb667e26..1f49cabd6 100644
--- a/xc/programs/Xserver/dbe/dbe.c
+++ b/xc/programs/Xserver/dbe/dbe.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Xdbeproto.h,v 1.1 95/05/25 17:29:33 dpw Exp dpw $ */
+/* $XConsortium: dbe.c,v 1.2 95/06/07 20:19:57 dpw Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written
* authorization from the Hewlett-Packard Company.
*
- * $Header: dbe.c,v 55.25 95/05/26 16:20:43 yip Exp $
+ * $Header: /x/programs/Xserver/dbe/RCS/dbe.c,v 1.2 95/06/07 20:19:57 dpw Exp $
*
* DIX DBE code
*
diff --git a/xc/programs/Xserver/dbe/dbestruct.h b/xc/programs/Xserver/dbe/dbestruct.h
index 8fffd9625..cc8585047 100644
--- a/xc/programs/Xserver/dbe/dbestruct.h
+++ b/xc/programs/Xserver/dbe/dbestruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xdbeproto.h,v 1.1 95/05/25 17:29:33 dpw Exp dpw $ */
+/* $XConsortium: dbestruct.h,v 1.2 95/06/07 20:19:57 dpw Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written
* authorization from the Hewlett-Packard Company.
*
- * $Header: dbestruct.h,v 55.11 95/05/18 14:12:47 yip Exp $
+ * $Header: /x/programs/Xserver/dbe/RCS/dbestruct.h,v 1.2 95/06/07 20:19:57 dpw Exp $
*
* Header file for DIX-related DBE
*
diff --git a/xc/programs/Xserver/dbe/midbe.c b/xc/programs/Xserver/dbe/midbe.c
index fd7f47f73..fb3d8fc31 100644
--- a/xc/programs/Xserver/dbe/midbe.c
+++ b/xc/programs/Xserver/dbe/midbe.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Xdbeproto.h,v 1.1 95/05/25 17:29:33 dpw Exp dpw $ */
+/* $XConsortium: midbe.c,v 1.2 95/06/07 20:19:57 dpw Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written
* authorization from the Hewlett-Packard Company.
*
- * $Header: midbe.c,v 55.16 95/05/19 14:53:50 yip Exp $
+ * $Header: /x/programs/Xserver/dbe/RCS/midbe.c,v 1.2 95/06/07 20:19:57 dpw Exp $
*
* Machine-independent DBE code
*
diff --git a/xc/programs/Xserver/dbe/midbe.h b/xc/programs/Xserver/dbe/midbe.h
index 8d8dd5c8e..7d39a5223 100644
--- a/xc/programs/Xserver/dbe/midbe.h
+++ b/xc/programs/Xserver/dbe/midbe.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xdbeproto.h,v 1.1 95/05/25 17:29:33 dpw Exp dpw $ */
+/* $XConsortium: midbe.h,v 1.2 95/06/07 20:19:57 dpw Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written
* authorization from the Hewlett-Packard Company.
*
- * $Header: midbe.h,v 55.1 95/03/10 15:33:45 todd Exp $
+ * $Header: /x/programs/Xserver/dbe/RCS/midbe.h,v 1.2 95/06/07 20:19:57 dpw Exp $
*
* Header file for users of machine-independent DBE code
*
diff --git a/xc/programs/Xserver/dbe/midbestruct.h b/xc/programs/Xserver/dbe/midbestruct.h
index 910ccbf32..3a38714be 100644
--- a/xc/programs/Xserver/dbe/midbestruct.h
+++ b/xc/programs/Xserver/dbe/midbestruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xdbeproto.h,v 1.1 95/05/25 17:29:33 dpw Exp dpw $ */
+/* $XConsortium: midbestruct.h,v 1.2 95/06/07 20:19:57 dpw Exp $ */
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
@@ -27,7 +27,7 @@
* sale, use or other dealings in this Software without prior written
* authorization from the Hewlett-Packard Company.
*
- * $Header: midbestruct.h,v 55.2 95/05/18 14:14:18 yip Exp $
+ * $Header: /x/programs/Xserver/dbe/RCS/midbestruct.h,v 1.2 95/06/07 20:19:57 dpw Exp $
*
* Header file for users of machine-independent DBE code
*
diff --git a/xc/programs/Xserver/dix/Imakefile b/xc/programs/Xserver/dix/Imakefile
index 23f0c76ba..00d512a33 100644
--- a/xc/programs/Xserver/dix/Imakefile
+++ b/xc/programs/Xserver/dix/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.47 94/11/21 18:27:00 kaleb Exp dpw $
+XCOMM $XConsortium: Imakefile,v 1.48 95/05/18 20:36:02 dpw Exp $
#include <Server.tmpl>
SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
diff --git a/xc/programs/Xserver/dix/atom.c b/xc/programs/Xserver/dix/atom.c
index 47e097f45..b12441a18 100644
--- a/xc/programs/Xserver/dix/atom.c
+++ b/xc/programs/Xserver/dix/atom.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: atom.c,v 1.29 93/09/20 16:04:37 dpw Exp $ */
+/* $XConsortium: atom.c,v 1.30 94/04/17 20:26:16 dpw Exp $ */
#include "X.h"
#include "Xatom.h"
diff --git a/xc/programs/Xserver/dix/colormap.c b/xc/programs/Xserver/dix/colormap.c
index bbd34131f..29ffc434b 100644
--- a/xc/programs/Xserver/dix/colormap.c
+++ b/xc/programs/Xserver/dix/colormap.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: colormap.c,v 5.32 94/11/02 15:57:55 kaleb Exp dpw $ */
+/* $XConsortium: colormap.c,v 5.33 95/05/18 21:08:14 dpw Exp $ */
#include "X.h"
#define NEED_EVENTS
diff --git a/xc/programs/Xserver/dix/cursor.c b/xc/programs/Xserver/dix/cursor.c
index ac780ee18..03873f8b4 100644
--- a/xc/programs/Xserver/dix/cursor.c
+++ b/xc/programs/Xserver/dix/cursor.c
@@ -47,7 +47,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: cursor.c,v 1.43 93/07/12 09:23:49 dpw Exp $ */
+/* $XConsortium: cursor.c,v 1.44 94/04/17 20:26:20 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/dix/devices.c b/xc/programs/Xserver/dix/devices.c
index ff6da7004..b320c5349 100644
--- a/xc/programs/Xserver/dix/devices.c
+++ b/xc/programs/Xserver/dix/devices.c
@@ -47,7 +47,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: devices.c,v 5.45 94/04/17 20:26:22 frob Exp $ */
+/* $XConsortium: devices.c,v 5.46 94/08/16 13:45:06 dpw Exp $ */
#include "X.h"
#include "misc.h"
diff --git a/xc/programs/Xserver/dix/dispatch.c b/xc/programs/Xserver/dix/dispatch.c
index 2439ba6c3..a0a1af297 100644
--- a/xc/programs/Xserver/dix/dispatch.c
+++ b/xc/programs/Xserver/dix/dispatch.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dispatch.c,v 5.67 94/11/02 15:58:49 kaleb Exp kaleb $ */
+/* $XConsortium: dispatch.c,v 5.68 95/04/07 18:59:08 kaleb Exp $ */
/************************************************************
Copyright (c) 1987, 1989 X Consortium
diff --git a/xc/programs/Xserver/dix/dixfonts.c b/xc/programs/Xserver/dix/dixfonts.c
index 6e9046cf6..1e29bb2e9 100644
--- a/xc/programs/Xserver/dix/dixfonts.c
+++ b/xc/programs/Xserver/dix/dixfonts.c
@@ -21,7 +21,7 @@ SOFTWARE.
************************************************************************/
-/* $XConsortium: dixfonts.c,v 1.54 95/05/19 19:18:17 dpw Exp dpw $ */
+/* $XConsortium: dixfonts.c,v 1.55 95/05/19 19:35:35 dpw Exp $ */
#define NEED_REPLIES
#include "X.h"
diff --git a/xc/programs/Xserver/dix/dixutils.c b/xc/programs/Xserver/dix/dixutils.c
index 5205dee5f..e2c5e3cff 100644
--- a/xc/programs/Xserver/dix/dixutils.c
+++ b/xc/programs/Xserver/dix/dixutils.c
@@ -82,7 +82,7 @@ Author: Adobe Systems Incorporated
*/
-/* $XConsortium: dixutils.c,v 1.49 94/02/10 17:27:19 dpw Exp $ */
+/* $XConsortium: dixutils.c,v 1.50 94/04/17 20:26:31 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/dix/events.c b/xc/programs/Xserver/dix/events.c
index e44b5852e..63c9aba5a 100644
--- a/xc/programs/Xserver/dix/events.c
+++ b/xc/programs/Xserver/dix/events.c
@@ -47,7 +47,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: events.c,v 5.75 94/04/17 20:26:33 frob Exp $ */
+/* $XConsortium: events.c,v 5.76 94/08/16 13:45:06 dpw Exp $ */
#include "X.h"
#include "misc.h"
diff --git a/xc/programs/Xserver/dix/extension.c b/xc/programs/Xserver/dix/extension.c
index 4c555fe38..2bf8268a7 100644
--- a/xc/programs/Xserver/dix/extension.c
+++ b/xc/programs/Xserver/dix/extension.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: extension.c,v 1.54 94/12/02 16:30:12 mor Exp $ */
+/* $XConsortium: extension.c,v 1.55 95/02/27 16:43:20 dpw Exp $ */
#include "X.h"
#define NEED_REPLIES
diff --git a/xc/programs/Xserver/dix/gc.c b/xc/programs/Xserver/dix/gc.c
index 8c87076f7..dd6d047fb 100644
--- a/xc/programs/Xserver/dix/gc.c
+++ b/xc/programs/Xserver/dix/gc.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: gc.c,v 5.27 94/04/17 20:26:36 dpw Exp $ */
+/* $XConsortium: gc.c,v 5.28 95/02/27 16:42:14 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/dix/globals.c b/xc/programs/Xserver/dix/globals.c
index 5dbc4ccef..5246c0491 100644
--- a/xc/programs/Xserver/dix/globals.c
+++ b/xc/programs/Xserver/dix/globals.c
@@ -46,7 +46,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: globals.c,v 1.52 93/09/23 16:54:17 rws Exp $ */
+/* $XConsortium: globals.c,v 1.53 94/04/17 20:26:37 rws Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/dix/glyphcurs.c b/xc/programs/Xserver/dix/glyphcurs.c
index 97b2bd25e..394f9edad 100644
--- a/xc/programs/Xserver/dix/glyphcurs.c
+++ b/xc/programs/Xserver/dix/glyphcurs.c
@@ -46,7 +46,7 @@ SOFTWARE.
************************************************************************/
-/* $XConsortium: glyphcurs.c,v 5.14 94/02/23 15:48:24 dpw Exp $ */
+/* $XConsortium: glyphcurs.c,v 5.15 94/04/17 20:26:38 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/dix/grabs.c b/xc/programs/Xserver/dix/grabs.c
index 549477f53..f08527b48 100644
--- a/xc/programs/Xserver/dix/grabs.c
+++ b/xc/programs/Xserver/dix/grabs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: grabs.c,v 5.9 94/02/16 11:39:59 dpw Exp $ */
+/* $XConsortium: grabs.c,v 5.10 94/04/17 20:26:39 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/dix/main.c b/xc/programs/Xserver/dix/main.c
index 6c332e88b..3ead7a44d 100644
--- a/xc/programs/Xserver/dix/main.c
+++ b/xc/programs/Xserver/dix/main.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: main.c,v 5.32 95/01/03 14:32:03 dpw Exp kaleb $ */
+/* $XConsortium: main.c,v 5.33 95/04/07 18:59:06 kaleb Exp $ */
#include "X.h"
#include "Xproto.h"
diff --git a/xc/programs/Xserver/dix/pixmap.c b/xc/programs/Xserver/dix/pixmap.c
index 66110396b..946406c5d 100644
--- a/xc/programs/Xserver/dix/pixmap.c
+++ b/xc/programs/Xserver/dix/pixmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pixmap.c,v 1.2 93/07/12 16:32:25 dpw Exp $ */
+/* $XConsortium: pixmap.c,v 1.3 94/04/17 20:26:41 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/dix/privates.c b/xc/programs/Xserver/dix/privates.c
index 3d60953cf..c7b82e027 100644
--- a/xc/programs/Xserver/dix/privates.c
+++ b/xc/programs/Xserver/dix/privates.c
@@ -1,4 +1,4 @@
-/* $XConsortium: privates.c,v 1.3 94/02/04 16:20:27 rws Exp $ */
+/* $XConsortium: privates.c,v 1.4 94/04/17 20:26:41 rws Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/dix/property.c b/xc/programs/Xserver/dix/property.c
index dd335720b..846218efb 100644
--- a/xc/programs/Xserver/dix/property.c
+++ b/xc/programs/Xserver/dix/property.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: property.c,v 5.15 94/04/04 18:04:04 dpw Exp $ */
+/* $XConsortium: property.c,v 5.16 94/04/17 20:26:42 dpw Exp $ */
#include "X.h"
#define NEED_REPLIES
diff --git a/xc/programs/Xserver/dix/resource.c b/xc/programs/Xserver/dix/resource.c
index 90f335682..99d1a23f1 100644
--- a/xc/programs/Xserver/dix/resource.c
+++ b/xc/programs/Xserver/dix/resource.c
@@ -46,7 +46,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: resource.c,v 1.94 94/03/25 16:39:24 dpw Exp $ */
+/* $XConsortium: resource.c,v 1.95 94/04/17 20:26:43 dpw Exp $ */
/* Routines to manage various kinds of resources:
*
diff --git a/xc/programs/Xserver/dix/swaprep.c b/xc/programs/Xserver/dix/swaprep.c
index 05b79bacf..01b1714aa 100644
--- a/xc/programs/Xserver/dix/swaprep.c
+++ b/xc/programs/Xserver/dix/swaprep.c
@@ -46,7 +46,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: swaprep.c,v 1.42 94/04/17 20:26:44 dpw Exp mor $ */
+/* $XConsortium: swaprep.c,v 1.43 95/05/02 19:41:30 mor Exp $ */
#include "X.h"
#define NEED_REPLIES
diff --git a/xc/programs/Xserver/dix/swapreq.c b/xc/programs/Xserver/dix/swapreq.c
index 258b661e1..15950fbdc 100644
--- a/xc/programs/Xserver/dix/swapreq.c
+++ b/xc/programs/Xserver/dix/swapreq.c
@@ -46,7 +46,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: swapreq.c,v 1.38 94/02/23 15:48:37 dpw Exp $ */
+/* $XConsortium: swapreq.c,v 1.39 94/04/17 20:26:45 dpw Exp $ */
#include "X.h"
#define NEED_EVENTS
diff --git a/xc/programs/Xserver/dix/tables.c b/xc/programs/Xserver/dix/tables.c
index b7e776437..6093d948d 100644
--- a/xc/programs/Xserver/dix/tables.c
+++ b/xc/programs/Xserver/dix/tables.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: tables.c,v 1.24 93/09/28 01:27:05 gildea Exp $ */
+/* $XConsortium: tables.c,v 1.25 94/04/17 20:26:46 gildea Exp $ */
extern int ProcInitialConnection(), ProcEstablishConnection();
diff --git a/xc/programs/Xserver/dix/window.c b/xc/programs/Xserver/dix/window.c
index 4de778f11..a0767c036 100644
--- a/xc/programs/Xserver/dix/window.c
+++ b/xc/programs/Xserver/dix/window.c
@@ -1,4 +1,4 @@
-/* $XConsortium: window.c,v 5.104 94/04/17 20:26:49 dpw Exp gildea $ */
+/* $XConsortium: window.c,v 5.105 94/09/02 23:32:00 gildea Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/Imakefile b/xc/programs/Xserver/hw/dec/ws/Imakefile
index 53057060d..68264edd8 100644
--- a/xc/programs/Xserver/hw/dec/ws/Imakefile
+++ b/xc/programs/Xserver/hw/dec/ws/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.11 93/12/13 17:40:46 dpw Exp $
+XCOMM $XConsortium: Imakefile,v 1.12 94/01/21 22:10:18 dpw Exp $
#include <Server.tmpl>
XCOMM
diff --git a/xc/programs/Xserver/hw/dec/ws/Xdec.man b/xc/programs/Xserver/hw/dec/ws/Xdec.man
index 15a05a762..3d17a802f 100644
--- a/xc/programs/Xserver/hw/dec/ws/Xdec.man
+++ b/xc/programs/Xserver/hw/dec/ws/Xdec.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: Xdec.man,v 1.5 94/04/13 18:42:36 gildea Exp $
+.\" $XConsortium: Xdec.man,v 1.6 94/04/17 20:29:52 gildea Exp $
.\" Copyright 1991 Digital Equipment Corporation
.\" Copyright (c) 1993 X Consortium
.\"
diff --git a/xc/programs/Xserver/hw/dec/ws/acc_2da.c b/xc/programs/Xserver/hw/dec/ws/acc_2da.c
index 3ebf13461..33ea6335e 100644
--- a/xc/programs/Xserver/hw/dec/ws/acc_2da.c
+++ b/xc/programs/Xserver/hw/dec/ws/acc_2da.c
@@ -1,4 +1,4 @@
-/* $XConsortium: acc_2da.c,v 1.2 91/07/08 11:16:17 keith Exp $ */
+/* $XConsortium: acc_2da.c,v 1.3 94/04/17 20:29:52 keith Exp $ */
/***********************************************************
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/acc_3d.c b/xc/programs/Xserver/hw/dec/ws/acc_3d.c
index 8671f55c8..c9ea4267a 100644
--- a/xc/programs/Xserver/hw/dec/ws/acc_3d.c
+++ b/xc/programs/Xserver/hw/dec/ws/acc_3d.c
@@ -1,4 +1,4 @@
-/* $XConsortium: acc_3d.c,v 1.2 91/07/08 11:16:19 keith Exp $ */
+/* $XConsortium: acc_3d.c,v 1.3 94/04/17 20:29:53 keith Exp $ */
/***********************************************************
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/acc_none.c b/xc/programs/Xserver/hw/dec/ws/acc_none.c
index 9fd95fea9..de771e078 100644
--- a/xc/programs/Xserver/hw/dec/ws/acc_none.c
+++ b/xc/programs/Xserver/hw/dec/ws/acc_none.c
@@ -1,4 +1,4 @@
-/* $XConsortium: acc_none.c,v 1.3 92/08/22 15:39:08 rws Exp $ */
+/* $XConsortium: acc_none.c,v 1.4 94/04/17 20:29:53 rws Exp $ */
/***********************************************************
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/cfbinit.c b/xc/programs/Xserver/hw/dec/ws/cfbinit.c
index 69349c4af..edc4143cf 100644
--- a/xc/programs/Xserver/hw/dec/ws/cfbinit.c
+++ b/xc/programs/Xserver/hw/dec/ws/cfbinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbinit.c,v 1.7 94/04/17 20:29:53 dpw Exp kaleb $ */
+/* $XConsortium: cfbinit.c,v 1.8 94/11/02 16:00:47 kaleb Exp $ */
/***********************************************************
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/ext_device.c b/xc/programs/Xserver/hw/dec/ws/ext_device.c
index a7a4076a3..950716f6f 100644
--- a/xc/programs/Xserver/hw/dec/ws/ext_device.c
+++ b/xc/programs/Xserver/hw/dec/ws/ext_device.c
@@ -53,7 +53,7 @@ SOFTWARE.
*
*/
-/* $XConsortium: ext_device.c,v 1.2 91/07/08 11:16:24 keith Exp $ */
+/* $XConsortium: ext_device.c,v 1.3 94/04/17 20:29:54 keith Exp $ */
#ifdef XINPUT
diff --git a/xc/programs/Xserver/hw/dec/ws/init.c b/xc/programs/Xserver/hw/dec/ws/init.c
index caa37e754..de0e08efd 100644
--- a/xc/programs/Xserver/hw/dec/ws/init.c
+++ b/xc/programs/Xserver/hw/dec/ws/init.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: init.c,v 1.10 94/04/17 20:29:55 dpw Exp dpw $ */
+/* $XConsortium: init.c,v 1.11 94/12/05 23:14:26 dpw Exp $ */
#include <stdio.h>
#include <sys/types.h>
diff --git a/xc/programs/Xserver/hw/dec/ws/keynames.h b/xc/programs/Xserver/hw/dec/ws/keynames.h
index 8fc6ce877..4e2242b9f 100644
--- a/xc/programs/Xserver/hw/dec/ws/keynames.h
+++ b/xc/programs/Xserver/hw/dec/ws/keynames.h
@@ -1,4 +1,4 @@
-/* $XConsortium: keynames.h,v 1.2 91/07/08 11:16:28 keith Exp $ */
+/* $XConsortium: keynames.h,v 1.3 94/04/17 20:29:55 keith Exp $ */
/***********************************************************
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/mdepthinit.c b/xc/programs/Xserver/hw/dec/ws/mdepthinit.c
index 4eeb5095d..c5dc16569 100644
--- a/xc/programs/Xserver/hw/dec/ws/mdepthinit.c
+++ b/xc/programs/Xserver/hw/dec/ws/mdepthinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mdepthinit.c,v 1.6 93/12/13 17:41:46 dpw Exp $ */
+/* $XConsortium: mdepthinit.c,v 1.7 94/04/17 20:29:56 dpw Exp $ */
/*
Copyright (c) 1992 X Consortium
diff --git a/xc/programs/Xserver/hw/dec/ws/ws.h b/xc/programs/Xserver/hw/dec/ws/ws.h
index 206d69dfa..298a6ca25 100644
--- a/xc/programs/Xserver/hw/dec/ws/ws.h
+++ b/xc/programs/Xserver/hw/dec/ws/ws.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ws.h,v 1.3 92/04/06 18:19:32 keith Exp $ */
+/* $XConsortium: ws.h,v 1.4 94/04/17 20:29:56 keith Exp $ */
#define NOMAPYET (ColormapPtr) 1
diff --git a/xc/programs/Xserver/hw/dec/ws/ws_color.c b/xc/programs/Xserver/hw/dec/ws/ws_color.c
index 2a8d58a7f..1b254c6f9 100644
--- a/xc/programs/Xserver/hw/dec/ws/ws_color.c
+++ b/xc/programs/Xserver/hw/dec/ws/ws_color.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: ws_color.c,v 1.5 92/04/06 18:19:34 keith Exp $ */
+/* $XConsortium: ws_color.c,v 1.6 94/04/17 20:29:57 keith Exp $ */
/*
* ws_color.c - device specific color routines, stored in screen
diff --git a/xc/programs/Xserver/hw/dec/ws/ws_io.c b/xc/programs/Xserver/hw/dec/ws/ws_io.c
index afe895dfc..45c571aed 100644
--- a/xc/programs/Xserver/hw/dec/ws/ws_io.c
+++ b/xc/programs/Xserver/hw/dec/ws/ws_io.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: ws_io.c,v 1.13 94/04/17 20:29:57 dpw Exp kaleb $ */
+/* $XConsortium: ws_io.c,v 1.14 94/11/02 16:01:29 kaleb Exp $ */
#include <stdio.h>
#include <sys/types.h>
diff --git a/xc/programs/Xserver/hw/hp/Imakefile b/xc/programs/Xserver/hw/hp/Imakefile
index e140bdd1c..004afa3ab 100644
--- a/xc/programs/Xserver/hw/hp/Imakefile
+++ b/xc/programs/Xserver/hw/hp/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 3.7 94/05/28 15:39:04 dpw Exp dpw $
+XCOMM $XConsortium: Imakefile,v 3.8 95/01/24 01:39:46 dpw Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/hp/Xhp.man b/xc/programs/Xserver/hw/hp/Xhp.man
index dcf509d67..a745d51b1 100644
--- a/xc/programs/Xserver/hw/hp/Xhp.man
+++ b/xc/programs/Xserver/hw/hp/Xhp.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: Xhp.man,v 1.66 94/04/15 23:01:55 rws Exp $
+.\" $XConsortium: Xhp.man,v 1.2 95/01/24 19:51:14 gildea Exp $
.\" Copyright (c) 1994 Hewlett-Packard Company
.\" Copyright (c) 1994 X Consortium
.\"
diff --git a/xc/programs/Xserver/hw/hp/ddx_info.c b/xc/programs/Xserver/hw/hp/ddx_info.c
index 326a2c065..6d1815c28 100644
--- a/xc/programs/Xserver/hw/hp/ddx_info.c
+++ b/xc/programs/Xserver/hw/hp/ddx_info.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ddx_info.c,v 1.2 94/05/28 15:39:13 dpw Exp $ */
+/* $XConsortium: ddx_info.c,v 1.3 95/01/24 01:43:05 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/hpCursorUtils.c b/xc/programs/Xserver/hw/hp/hpCursorUtils.c
index 79e35ba32..dfb1b48ba 100644
--- a/xc/programs/Xserver/hw/hp/hpCursorUtils.c
+++ b/xc/programs/Xserver/hw/hp/hpCursorUtils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: hpCursorUtils.c,v 1.2 94/04/17 20:30:05 rws Exp $ */
+/* $XConsortium: hpCursorUtils.c,v 1.3 95/01/24 01:43:05 dpw Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/hpInit.c b/xc/programs/Xserver/hw/hp/hpInit.c
index 8d004fd8f..36251190d 100644
--- a/xc/programs/Xserver/hw/hp/hpInit.c
+++ b/xc/programs/Xserver/hw/hp/hpInit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: hpInit.c,v 1.4 94/05/28 15:39:14 dpw Exp $ */
+/* $XConsortium: hpInit.c,v 1.5 95/01/24 01:43:05 dpw Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/include/XHPproto.h b/xc/programs/Xserver/hw/hp/include/XHPproto.h
index 1eb52c93e..448e25ab7 100644
--- a/xc/programs/Xserver/hw/hp/include/XHPproto.h
+++ b/xc/programs/Xserver/hw/hp/include/XHPproto.h
@@ -1,4 +1,4 @@
-/* $XConsortium: XHPproto.h,v 1.1 93/08/08 12:56:03 rws Exp $ */
+/* $XConsortium: XHPproto.h,v 1.2 95/01/24 01:46:26 dpw Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/include/hppriv.h b/xc/programs/Xserver/hw/hp/include/hppriv.h
index 2ea64003b..547a19279 100644
--- a/xc/programs/Xserver/hw/hp/include/hppriv.h
+++ b/xc/programs/Xserver/hw/hp/include/hppriv.h
@@ -1,4 +1,4 @@
-/* $XConsortium: hppriv.h,v 1.1 93/08/08 12:56:09 rws Exp $ */
+/* $XConsortium: hppriv.h,v 1.2 94/04/17 20:30:06 rws Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/input/Imakefile b/xc/programs/Xserver/hw/hp/input/Imakefile
index 114842a8e..4ecdd00b5 100644
--- a/xc/programs/Xserver/hw/hp/input/Imakefile
+++ b/xc/programs/Xserver/hw/hp/input/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 94/05/28 15:50:16 dpw Exp $
+XCOMM $XConsortium: Imakefile,v 1.6 95/01/24 02:41:07 dpw Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/hp/input/X11/HPkeysym.h b/xc/programs/Xserver/hw/hp/input/X11/HPkeysym.h
index bd2d8b79a..87b79c3eb 100644
--- a/xc/programs/Xserver/hw/hp/input/X11/HPkeysym.h
+++ b/xc/programs/Xserver/hw/hp/input/X11/HPkeysym.h
@@ -1,4 +1,4 @@
-/* $XConsortium: HPkeysym.h,v 1.13 93/08/08 12:58:07 rws Exp $ */
+/* $XConsortium: HPkeysym.h,v 1.14 94/04/17 20:30:20 rws Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/X11/XHPlib.h b/xc/programs/Xserver/hw/hp/input/X11/XHPlib.h
index 37a792394..0d5d037f7 100644
--- a/xc/programs/Xserver/hw/hp/input/X11/XHPlib.h
+++ b/xc/programs/Xserver/hw/hp/input/X11/XHPlib.h
@@ -1,4 +1,4 @@
-/* $XConsortium: XHPlib.h,v 1.2 95/01/24 02:33:14 dpw Exp gildea $ */
+/* $XConsortium: XHPlib.h,v 1.3 95/01/24 23:40:16 gildea Exp $ */
/************************************************************
Copyright (c) 1992 by Hewlett-Packard Company, Palo Alto, California.
diff --git a/xc/programs/Xserver/hw/hp/input/cr16.s b/xc/programs/Xserver/hw/hp/input/cr16.s
index e4223a0b6..a367a7980 100644
--- a/xc/programs/Xserver/hw/hp/input/cr16.s
+++ b/xc/programs/Xserver/hw/hp/input/cr16.s
@@ -1,4 +1,4 @@
-; $XConsortium: cr16.s,v 1.1 93/08/08 12:58:34 rws Exp dpw $
+; $XConsortium: cr16.s,v 1.2 95/06/15 15:25:19 dpw Exp $
.SPACE $TEXT$
.SUBSPA $CODE$
.export cr16
diff --git a/xc/programs/Xserver/hw/hp/input/drivers/Imakefile b/xc/programs/Xserver/hw/hp/input/drivers/Imakefile
index f0d22b24f..87f524523 100644
--- a/xc/programs/Xserver/hw/hp/input/drivers/Imakefile
+++ b/xc/programs/Xserver/hw/hp/input/drivers/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 94/05/30 17:18:11 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.4 95/01/24 02:38:39 dpw Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/hp/input/drivers/X0screens b/xc/programs/Xserver/hw/hp/input/drivers/X0screens
index cc69bf6e2..793b022f0 100644
--- a/xc/programs/Xserver/hw/hp/input/drivers/X0screens
+++ b/xc/programs/Xserver/hw/hp/input/drivers/X0screens
@@ -1,3 +1,3 @@
-# $XConsortium$
+# $XConsortium: X0screens,v 1.1 95/01/23 21:56:39 dpw Exp $
/dev/crt
diff --git a/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c b/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c
index fc137286e..2e3dbde92 100644
--- a/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c
+++ b/xc/programs/Xserver/hw/hp/input/drivers/hil_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: hil_driver.c,v 1.1 95/01/25 13:45:20 dpw Exp gildea $ */
+/* $XConsortium: hil_driver.c,v 1.2 95/01/25 17:24:43 gildea Exp $ */
/************************************************************
Copyright (c) 1993 by Hewlett-Packard Company, Palo Alto, California
diff --git a/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2k.c b/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2k.c
index f3db36562..5b1577306 100644
--- a/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2k.c
+++ b/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2k.c
@@ -1,4 +1,4 @@
-/* $XConsortium: x_hil.c,v 8.142 94/04/17 20:30:15 dpw Exp $ */
+/* $XConsortium: hp7lc2k.c,v 1.1 94/05/28 14:32:42 dpw Exp $ */
/************************************************************
Copyright (c) 1993 by Hewlett-Packard Company, Palo Alto, California
diff --git a/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2m.c b/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2m.c
index 44e95ffaa..aec89da65 100644
--- a/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2m.c
+++ b/xc/programs/Xserver/hw/hp/input/drivers/hp7lc2m.c
@@ -1,4 +1,4 @@
-/* $XConsortium: x_hil.c,v 8.142 94/04/17 20:30:15 dpw Exp $ */
+/* $XConsortium: hp7lc2m.c,v 1.1 94/05/28 14:32:48 dpw Exp $ */
/************************************************************
Copyright (c) 1992 by Hewlett-Packard Company, Palo Alto, California
diff --git a/xc/programs/Xserver/hw/hp/input/drivers/ps2io.h b/xc/programs/Xserver/hw/hp/input/drivers/ps2io.h
index 616462789..e5a30b961 100644
--- a/xc/programs/Xserver/hw/hp/input/drivers/ps2io.h
+++ b/xc/programs/Xserver/hw/hp/input/drivers/ps2io.h
@@ -1,6 +1,6 @@
-/* $XConsortium: x_hil.c,v 8.142 94/04/17 20:30:15 dpw Exp $ */
+/* $XConsortium: ps2io.h,v 1.1 94/05/28 14:32:49 dpw Exp $ */
/*
- * @(#)ps2io.h: $Revision: 1.3 $ $Date: 93/05/03 16:56:27 $
+ * @(#)ps2io.h: $Revision: 1.1 $ $Date: 94/12/15 09:22:14 $
* $Locker: $
*/
diff --git a/xc/programs/Xserver/hw/hp/input/get_tv.c b/xc/programs/Xserver/hw/hp/input/get_tv.c
index 4f9f2e31c..8cc49e97f 100644
--- a/xc/programs/Xserver/hw/hp/input/get_tv.c
+++ b/xc/programs/Xserver/hw/hp/input/get_tv.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: get_tv.c,v 1.1 93/08/08 12:58:41 rws Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/hp/input/getkeysym.c b/xc/programs/Xserver/hw/hp/input/getkeysym.c
index cd6418f8c..69a11bfe7 100644
--- a/xc/programs/Xserver/hw/hp/input/getkeysym.c
+++ b/xc/programs/Xserver/hw/hp/input/getkeysym.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getkeysym.c,v 1.6 94/05/28 15:50:21 dpw Exp $ */
+/* $XConsortium: getkeysym.c,v 1.7 95/01/24 02:45:23 dpw Exp $ */
/*
Copyright (c) 1986, 1987 by Hewlett-Packard Company
diff --git a/xc/programs/Xserver/hw/hp/input/hildef.h b/xc/programs/Xserver/hw/hp/input/hildef.h
index d8195656f..711936105 100644
--- a/xc/programs/Xserver/hw/hp/input/hildef.h
+++ b/xc/programs/Xserver/hw/hp/input/hildef.h
@@ -1,6 +1,6 @@
#ifndef HILDEF_H
#define HILDEF_H
-/* $XConsortium: hildef.h,v 8.35 95/01/24 02:43:17 dpw Exp gildea $ */
+/* $XConsortium: hildef.h,v 8.36 95/01/24 21:13:11 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/hpKeyMap.c b/xc/programs/Xserver/hw/hp/input/hpKeyMap.c
index dd2d01fd9..b4bb97462 100644
--- a/xc/programs/Xserver/hw/hp/input/hpKeyMap.c
+++ b/xc/programs/Xserver/hw/hp/input/hpKeyMap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: hpKeyMap.c,v 1.2 94/04/17 20:30:13 rws Exp $ */
+/* $XConsortium: hpKeyMap.c,v 1.3 95/01/24 02:46:58 dpw Exp $ */
/*
Copyright (c) 1986, 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/hpext.h b/xc/programs/Xserver/hw/hp/input/hpext.h
index e5bef9c1b..1e77af8ed 100644
--- a/xc/programs/Xserver/hw/hp/input/hpext.h
+++ b/xc/programs/Xserver/hw/hp/input/hpext.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: hpext.h,v 1.1 93/08/08 12:59:01 rws Exp $ */
/*
@@ -29,7 +29,7 @@ University of California.
#ifndef HPEXT_H
#define HPEXT_H
-/* $Header: hpext.h,v 1.1 92/07/29 16:30:18 xbuild Exp $ */
+/* $Header: hpext.h,v 1.1 94/07/22 11:27:28 xbuild Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/xc/programs/Xserver/hw/hp/input/hpkeys.h b/xc/programs/Xserver/hw/hp/input/hpkeys.h
index 1db90243f..2262f28e2 100644
--- a/xc/programs/Xserver/hw/hp/input/hpkeys.h
+++ b/xc/programs/Xserver/hw/hp/input/hpkeys.h
@@ -1,6 +1,6 @@
#ifndef HPKEYS_H
#define HPKEYS_H
-/* $XConsortium: hpkeys.h,v 1.1 93/08/08 12:59:16 rws Exp $ */
+/* $XConsortium: hpkeys.h,v 1.2 94/04/17 20:30:14 rws Exp $ */
/*
Copyright (c) 1986, 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/screentab.h b/xc/programs/Xserver/hw/hp/input/screentab.h
index 028c5e432..5ccda364e 100644
--- a/xc/programs/Xserver/hw/hp/input/screentab.h
+++ b/xc/programs/Xserver/hw/hp/input/screentab.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: screentab.h,v 1.4 95/01/24 23:31:56 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/x_hil.c b/xc/programs/Xserver/hw/hp/input/x_hil.c
index 4901746fe..570825421 100644
--- a/xc/programs/Xserver/hw/hp/input/x_hil.c
+++ b/xc/programs/Xserver/hw/hp/input/x_hil.c
@@ -1,4 +1,4 @@
-/* $XConsortium: x_hil.c,v 8.145 95/01/24 23:28:35 gildea Exp kaleb $ */
+/* $XConsortium: x_hil.c,v 8.146 95/04/05 19:58:38 kaleb Exp $ */
/*******************************************************************
**
diff --git a/xc/programs/Xserver/hw/hp/input/x_hil.h b/xc/programs/Xserver/hw/hp/input/x_hil.h
index f7d365fde..2eb938092 100644
--- a/xc/programs/Xserver/hw/hp/input/x_hil.h
+++ b/xc/programs/Xserver/hw/hp/input/x_hil.h
@@ -1,6 +1,6 @@
#ifndef X_HIL_H
#define X_HIL_H
-/* $XConsortium$ */
+/* $XConsortium: x_hil.h,v 1.4 95/01/24 23:29:42 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/x_hilinit.c b/xc/programs/Xserver/hw/hp/input/x_hilinit.c
index 0f22c3bba..a7bd73a87 100644
--- a/xc/programs/Xserver/hw/hp/input/x_hilinit.c
+++ b/xc/programs/Xserver/hw/hp/input/x_hilinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: x_hilinit.c,v 8.204 95/01/24 23:30:43 gildea Exp gildea $ */
+/* $XConsortium: x_hilinit.c,v 8.205 95/01/27 19:02:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/x_hilinit.h b/xc/programs/Xserver/hw/hp/input/x_hilinit.h
index 45d384154..885519ffd 100644
--- a/xc/programs/Xserver/hw/hp/input/x_hilinit.h
+++ b/xc/programs/Xserver/hw/hp/input/x_hilinit.h
@@ -1,6 +1,6 @@
#ifndef X_HILINIT_H
#define X_HILINIT_H
-/* $XConsortium: x_hilinit.h,v 8.28 93/08/08 12:59:44 rws Exp $ */
+/* $XConsortium: x_hilinit.h,v 8.29 94/04/17 20:30:18 rws Exp $ */
/*
Copyright (c) 1986, 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/hp/input/x_serialdrv.h b/xc/programs/Xserver/hw/hp/input/x_serialdrv.h
index fd3b0fed9..3f267f514 100644
--- a/xc/programs/Xserver/hw/hp/input/x_serialdrv.h
+++ b/xc/programs/Xserver/hw/hp/input/x_serialdrv.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: x_serialdrv.h,v 1.3 95/01/24 23:37:51 gildea Exp $ */
/************************************************************
Copyright (c) 1992 by Hewlett-Packard Company, Palo Alto, California.
diff --git a/xc/programs/Xserver/hw/hp/input/xtest1imp.c b/xc/programs/Xserver/hw/hp/input/xtest1imp.c
index d6a63d3c9..9085f54a2 100644
--- a/xc/programs/Xserver/hw/hp/input/xtest1imp.c
+++ b/xc/programs/Xserver/hw/hp/input/xtest1imp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xtest1imp.c,v 1.2 94/04/17 20:30:19 rws Exp $ */
+/* $XConsortium: xtest1imp.c,v 1.3 95/01/24 02:59:30 dpw Exp $ */
/*
* File: xtest1dd.c
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/Imakefile b/xc/programs/Xserver/hw/hp/ngle/Imakefile
index 8bcac6d85..7ede0ff35 100644
--- a/xc/programs/Xserver/hw/hp/ngle/Imakefile
+++ b/xc/programs/Xserver/hw/hp/ngle/Imakefile
@@ -1,4 +1,4 @@
-/* $XConsortium: Imakefile,v 1.5 95/01/24 01:52:09 dpw Exp gildea $ */
+/* $XConsortium: Imakefile,v 1.6 95/01/25 23:37:39 gildea Exp $ */
#include <Server.tmpl>
ORIG_SRCS = nglescreen.c \
diff --git a/xc/programs/Xserver/hw/hp/ngle/dregs.h b/xc/programs/Xserver/hw/hp/ngle/dregs.h
index cfbe80ac7..afbd308da 100644
--- a/xc/programs/Xserver/hw/hp/ngle/dregs.h
+++ b/xc/programs/Xserver/hw/hp/ngle/dregs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dregs.h,v 1.2 94/05/28 15:45:25 dpw Exp $ */
+/* $XConsortium: dregs.h,v 1.3 95/01/24 01:54:12 dpw Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/ngle/hyperScrn.c b/xc/programs/Xserver/hw/hp/ngle/hyperScrn.c
index e07db9fd7..b4fba01ec 100644
--- a/xc/programs/Xserver/hw/hp/ngle/hyperScrn.c
+++ b/xc/programs/Xserver/hw/hp/ngle/hyperScrn.c
@@ -1,4 +1,4 @@
-/* $XConsortium: hyperScreen.c,v 1.1 94/08/16 15:45:33 rek Exp $ */
+/* $XConsortium: hyperScrn.c,v 1.1 95/01/25 16:14:36 gildea Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/ngle/ngle.h b/xc/programs/Xserver/hw/hp/ngle/ngle.h
index 1861bd4c6..c8784baf0 100644
--- a/xc/programs/Xserver/hw/hp/ngle/ngle.h
+++ b/xc/programs/Xserver/hw/hp/ngle/ngle.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ngle.h,v 1.2 94/05/28 15:45:30 dpw Exp $ */
+/* $XConsortium: ngle.h,v 1.3 95/01/24 01:55:45 dpw Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/ngle/ngleblt.c b/xc/programs/Xserver/hw/hp/ngle/ngleblt.c
index 1ea26fdba..f47796239 100644
--- a/xc/programs/Xserver/hw/hp/ngle/ngleblt.c
+++ b/xc/programs/Xserver/hw/hp/ngle/ngleblt.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ngleblt.c,v 1.1 93/08/08 12:56:35 rws Exp $ */
/*
****************************************************************************
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglecolormap.c b/xc/programs/Xserver/hw/hp/ngle/nglecolormap.c
index 050bac580..fd7635a5f 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglecolormap.c
+++ b/xc/programs/Xserver/hw/hp/ngle/nglecolormap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: nglecolormap.c,v 1.1 93/08/08 12:56:41 rws Exp $ */
+/* $XConsortium: nglecolormap.c,v 1.2 95/01/24 02:00:06 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglecolormap.h b/xc/programs/Xserver/hw/hp/ngle/nglecolormap.h
index e6c685168..07c8e92c2 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglecolormap.h
+++ b/xc/programs/Xserver/hw/hp/ngle/nglecolormap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: nglecolormap.h,v 1.1 93/08/08 12:56:48 rws Exp $ */
+/* $XConsortium: nglecolormap.h,v 1.2 95/01/24 02:02:01 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglecopy.c b/xc/programs/Xserver/hw/hp/ngle/nglecopy.c
index be8ddff37..812bb55da 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglecopy.c
+++ b/xc/programs/Xserver/hw/hp/ngle/nglecopy.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: nglecopy.c,v 1.1 93/08/08 12:56:54 rws Exp $ */
/*
****************************************************************************
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglecopy.h b/xc/programs/Xserver/hw/hp/ngle/nglecopy.h
index 1f61d121d..bf9641cdf 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglecopy.h
+++ b/xc/programs/Xserver/hw/hp/ngle/nglecopy.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: nglecopy.h,v 1.1 93/08/08 12:57:01 rws Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglecursor.c b/xc/programs/Xserver/hw/hp/ngle/nglecursor.c
index 6c919e97d..4813b3e01 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglecursor.c
+++ b/xc/programs/Xserver/hw/hp/ngle/nglecursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: nglecursor.c,v 1.2 94/05/28 15:45:31 dpw Exp $ */
+/* $XConsortium: nglecursor.c,v 1.3 95/01/24 02:05:50 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglecursor.h b/xc/programs/Xserver/hw/hp/ngle/nglecursor.h
index 3ca2ade31..58f22de72 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglecursor.h
+++ b/xc/programs/Xserver/hw/hp/ngle/nglecursor.h
@@ -1,4 +1,4 @@
-/* $XConsortium: nglecursor.h,v 1.1 93/08/08 12:57:15 rws Exp $ */
+/* $XConsortium: nglecursor.h,v 1.2 95/01/24 02:07:13 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/ngledevrom.h b/xc/programs/Xserver/hw/hp/ngle/ngledevrom.h
index 16f66f5e9..c221bc373 100644
--- a/xc/programs/Xserver/hw/hp/ngle/ngledevrom.h
+++ b/xc/programs/Xserver/hw/hp/ngle/ngledevrom.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ngledevrom.h,v 1.1 93/08/08 12:57:21 rws Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/ngleextern.h b/xc/programs/Xserver/hw/hp/ngle/ngleextern.h
index 70c1e8347..5a07303e6 100644
--- a/xc/programs/Xserver/hw/hp/ngle/ngleextern.h
+++ b/xc/programs/Xserver/hw/hp/ngle/ngleextern.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ngleextern.h,v 1.1 93/08/08 12:57:27 rws Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglehdw.h b/xc/programs/Xserver/hw/hp/ngle/nglehdw.h
index 826fbe7aa..74be49d58 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglehdw.h
+++ b/xc/programs/Xserver/hw/hp/ngle/nglehdw.h
@@ -1,4 +1,4 @@
-/* $XConsortium: nglehdw.h,v 1.2 94/05/28 15:45:32 dpw Exp $ */
+/* $XConsortium: nglehdw.h,v 1.3 95/01/24 01:58:28 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglenoop.c b/xc/programs/Xserver/hw/hp/ngle/nglenoop.c
index d264d0d88..d65e035bd 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglenoop.c
+++ b/xc/programs/Xserver/hw/hp/ngle/nglenoop.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: nglenoop.c,v 1.1 93/08/08 12:57:40 rws Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglenoop.h b/xc/programs/Xserver/hw/hp/ngle/nglenoop.h
index fe1680c58..0133b9279 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglenoop.h
+++ b/xc/programs/Xserver/hw/hp/ngle/nglenoop.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: nglenoop.h,v 1.1 93/08/08 12:57:46 rws Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglescreen.c b/xc/programs/Xserver/hw/hp/ngle/nglescreen.c
index bae63d2a3..8f1e2e61e 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglescreen.c
+++ b/xc/programs/Xserver/hw/hp/ngle/nglescreen.c
@@ -1,4 +1,4 @@
-/* $XConsortium: nglescreen.c,v 1.2 94/05/28 15:45:33 dpw Exp $ */
+/* $XConsortium: nglescreen.c,v 1.3 95/01/24 02:15:14 dpw Exp $ */
/*************************************************************************
*
* (c)Copyright 1992 Hewlett-Packard Co., All Rights Reserved.
diff --git a/xc/programs/Xserver/hw/hp/ngle/nglescreen.h b/xc/programs/Xserver/hw/hp/ngle/nglescreen.h
index 271f92e7e..1e0d745aa 100644
--- a/xc/programs/Xserver/hw/hp/ngle/nglescreen.h
+++ b/xc/programs/Xserver/hw/hp/ngle/nglescreen.h
@@ -1,4 +1,4 @@
-/* $XConsortium: nglescreen.h,v 1.1 93/08/08 12:58:00 rws Exp $ */
+/* $XConsortium: nglescreen.h,v 1.2 95/01/24 02:10:27 dpw Exp $ */
/*************************************************************************
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/AIX.h b/xc/programs/Xserver/hw/ibm/AIX/AIX.h
index aa2b4040f..ab777f35b 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/AIX.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/AIX.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: AIX.h,v 1.2 91/07/16 12:54:51 jap Exp $
+ * $XConsortium: AIX.h,v 1.3 91/11/22 17:06:53 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/AIXV3.c b/xc/programs/Xserver/hw/ibm/AIX/AIXV3.c
index 57822199e..1293deee3 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/AIXV3.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/AIXV3.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: AIXV3.c,v 1.4 91/07/16 12:55:43 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/AIXext.h b/xc/programs/Xserver/hw/ibm/AIX/AIXext.h
index d90010ca2..1f2c51697 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/AIXext.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/AIXext.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: AIXext.h,v 1.5 93/07/12 09:26:19 dpw Exp $
+ * $XConsortium: AIXext.h,v 1.6 94/03/21 15:39:52 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/AIXinit.c b/xc/programs/Xserver/hw/ibm/AIX/AIXinit.c
index 40563fc1c..07e8597bc 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/AIXinit.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/AIXinit.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: AIXinit.c,v 1.4 92/08/10 17:49:38 eswu Exp $
+ * $XConsortium: AIXinit.c,v 1.5 93/07/12 09:26:22 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/Imakefile b/xc/programs/Xserver/hw/ibm/AIX/Imakefile
index 6e3877d85..6aa00dd96 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/Imakefile
+++ b/xc/programs/Xserver/hw/ibm/AIX/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 93/09/04 17:31:05 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.6 93/09/06 15:26:16 rws Exp $
#include <Server.tmpl>
OSDEP_SRC = AIXV3.c AIXinit.c aixMsg.c aixError.c aixWrap.c
diff --git a/xc/programs/Xserver/hw/ibm/AIX/OScursor.h b/xc/programs/Xserver/hw/ibm/AIX/OScursor.h
index 071255162..9a71bc04b 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/OScursor.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/OScursor.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: OScursor.h,v 1.2 91/07/16 12:56:33 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/OSio.h b/xc/programs/Xserver/hw/ibm/AIX/OSio.h
index 2f48223a0..fa11e178e 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/OSio.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/OSio.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: OSio.h,v 1.3 93/07/12 09:26:24 dpw Exp $
+ * $XConsortium: OSio.h,v 1.4 93/09/05 15:37:36 rws Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/X_msg.h b/xc/programs/Xserver/hw/ibm/AIX/X_msg.h
index df34a5f6e..639829ae4 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/X_msg.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/X_msg.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: X_msg.h,v 1.2 91/07/16 12:57:23 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixCursor.c b/xc/programs/Xserver/hw/ibm/AIX/aixCursor.c
index 91de3b616..a26d9513d 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixCursor.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixCursor.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: aixCursor.c,v 1.3 91/07/16 12:58:05 jap Exp $
+ * $XConsortium: aixCursor.c,v 1.4 94/02/23 15:54:59 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixCursor.h b/xc/programs/Xserver/hw/ibm/AIX/aixCursor.h
index 7916eb2a4..9393efb7b 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixCursor.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixCursor.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixCursor.h,v 1.2 91/07/16 12:58:25 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixDebug.h b/xc/programs/Xserver/hw/ibm/AIX/aixDebug.h
index 733382d4d..93fa778e8 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixDebug.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixDebug.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixDebug.h,v 1.2 91/07/16 12:58:41 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixError.c b/xc/programs/Xserver/hw/ibm/AIX/aixError.c
index e10f6da43..851a4bd19 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixError.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixError.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixError.c,v 1.2 91/07/16 12:59:01 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixError.h b/xc/programs/Xserver/hw/ibm/AIX/aixError.h
index c7f548f91..10bc103bc 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixError.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixError.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixError.h,v 1.2 91/07/16 12:59:18 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixEvents.c b/xc/programs/Xserver/hw/ibm/AIX/aixEvents.c
index 11743ae00..b7c284515 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixEvents.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixEvents.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: aixEvents.c,v 1.5 93/09/05 15:55:37 rws Exp $
+ * $XConsortium: aixEvents.c,v 1.6 94/02/23 15:55:02 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixInput.h b/xc/programs/Xserver/hw/ibm/AIX/aixInput.h
index e9356724c..cf0b1bf83 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixInput.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixInput.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixInput.h,v 1.2 91/07/16 12:59:56 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixKeybd.c b/xc/programs/Xserver/hw/ibm/AIX/aixKeybd.c
index dff4bd7a1..eb574291e 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixKeybd.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixKeybd.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: aixKeybd.c,v 1.4 93/08/30 07:56:04 dpw Exp $
+ * $XConsortium: aixKeybd.c,v 1.5 94/02/23 15:55:05 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixKeymap.h b/xc/programs/Xserver/hw/ibm/AIX/aixKeymap.h
index ff1f81984..0309a1c7f 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixKeymap.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixKeymap.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: aixKeymap.h,v 1.2 91/07/16 13:00:30 jap Exp $
+ * $XConsortium: aixKeymap.h,v 1.3 91/11/22 17:06:56 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixMouse.c b/xc/programs/Xserver/hw/ibm/AIX/aixMouse.c
index ee340d276..95e59ef8e 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixMouse.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixMouse.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: aixMouse.c,v 1.4 91/11/22 17:05:04 eswu Exp $
+ * $XConsortium: aixMouse.c,v 1.5 93/08/30 07:56:47 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixMsg.c b/xc/programs/Xserver/hw/ibm/AIX/aixMsg.c
index d08c4c457..51234edc2 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixMsg.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixMsg.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixMsg.c,v 1.2 91/07/16 13:01:10 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/aixWrap.c b/xc/programs/Xserver/hw/ibm/AIX/aixWrap.c
index 3bc0824c7..5a7c2cb48 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/aixWrap.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/aixWrap.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: aixWrap.c,v 1.3 91/07/16 13:01:36 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/hftQueue.c b/xc/programs/Xserver/hw/ibm/AIX/hftQueue.c
index f5196dc1b..14d090ef7 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/hftQueue.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/hftQueue.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: hftQueue.c,v 1.5 91/09/09 13:24:12 rws Exp $
+ * $XConsortium: hftQueue.c,v 1.6 91/11/22 17:07:06 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/hftQueue.h b/xc/programs/Xserver/hw/ibm/AIX/hftQueue.h
index 4497fc31f..72b17df0d 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/hftQueue.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/hftQueue.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: hftQueue.h,v 1.2 91/07/16 13:02:35 jap Exp $
+ * $XConsortium: hftQueue.h,v 1.3 91/11/22 17:07:03 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/hftUtils.c b/xc/programs/Xserver/hw/ibm/AIX/hftUtils.c
index 40f9f150e..126b51118 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/hftUtils.c
+++ b/xc/programs/Xserver/hw/ibm/AIX/hftUtils.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: hftUtils.c,v 1.3 91/07/16 13:02:54 jap Exp $
+ * $XConsortium: hftUtils.c,v 1.4 91/09/09 13:22:24 rws Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/AIX/hftUtils.h b/xc/programs/Xserver/hw/ibm/AIX/hftUtils.h
index a3a9794d6..f0117e6c0 100644
--- a/xc/programs/Xserver/hw/ibm/AIX/hftUtils.h
+++ b/xc/programs/Xserver/hw/ibm/AIX/hftUtils.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: hftUtils.h,v 1.2 91/07/16 13:03:14 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/Imakefile b/xc/programs/Xserver/hw/ibm/Imakefile
index edf8c6dfc..c72acfddd 100644
--- a/xc/programs/Xserver/hw/ibm/Imakefile
+++ b/xc/programs/Xserver/hw/ibm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 92/08/10 15:12:15 eswu Exp $
+XCOMM $XConsortium: Imakefile,v 1.5 92/09/03 19:22:15 rws Exp $
#include <Server.tmpl>
/* "@(#)Imakefile 3.1 88/09/22 09:29:19" */
diff --git a/xc/programs/Xserver/hw/ibm/common/Imakefile b/xc/programs/Xserver/hw/ibm/common/Imakefile
index 2f58696b1..a29502674 100644
--- a/xc/programs/Xserver/hw/ibm/common/Imakefile
+++ b/xc/programs/Xserver/hw/ibm/common/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.4 91/07/16 22:54:21 gildea Exp $
#include <Server.tmpl>
SRCS = ibmColor.c \
diff --git a/xc/programs/Xserver/hw/ibm/common/OScompiler.h b/xc/programs/Xserver/hw/ibm/common/OScompiler.h
index 843bcb77e..c3946d67e 100644
--- a/xc/programs/Xserver/hw/ibm/common/OScompiler.h
+++ b/xc/programs/Xserver/hw/ibm/common/OScompiler.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: OScompiler.h,v 1.2 91/07/16 13:04:29 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/compiler.h b/xc/programs/Xserver/hw/ibm/common/compiler.h
index 843bcb77e..8f04ca939 100644
--- a/xc/programs/Xserver/hw/ibm/common/compiler.h
+++ b/xc/programs/Xserver/hw/ibm/common/compiler.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: compiler.h,v 1.2 91/07/16 13:04:49 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmColor.c b/xc/programs/Xserver/hw/ibm/common/ibmColor.c
index ff186912e..f6b706470 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmColor.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmColor.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ibmColor.c,v 1.3 93/07/12 09:27:12 dpw Exp $
+ * $XConsortium: ibmColor.c,v 1.4 94/02/23 15:55:19 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmColor.h b/xc/programs/Xserver/hw/ibm/common/ibmColor.h
index a690d32f5..3888c8bac 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmColor.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmColor.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmColor.h,v 1.2 91/07/16 13:05:26 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmDate.c b/xc/programs/Xserver/hw/ibm/common/ibmDate.c
index 99d11a854..274ee0128 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmDate.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmDate.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmDate.c,v 1.2 91/07/16 13:05:43 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmIO.c b/xc/programs/Xserver/hw/ibm/common/ibmIO.c
index ce81f055b..4faa12d26 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmIO.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmIO.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmIO.c,v 1.2 91/07/16 13:06:02 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmIO.h b/xc/programs/Xserver/hw/ibm/common/ibmIO.h
index 131feffcc..0d9a58e56 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmIO.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmIO.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmIO.h,v 1.2 91/07/16 13:06:20 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmInit.c b/xc/programs/Xserver/hw/ibm/common/ibmInit.c
index 3089903c6..fcb27635a 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmInit.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmInit.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ibmInit.c,v 1.7 93/08/30 08:03:15 dpw Exp $
+ * $XConsortium: ibmInit.c,v 1.8 94/02/23 15:55:22 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmInit.h b/xc/programs/Xserver/hw/ibm/common/ibmInit.h
index adfa01113..c4016746a 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmInit.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmInit.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmInit.h,v 1.2 91/07/16 13:06:57 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmKeybd.c b/xc/programs/Xserver/hw/ibm/common/ibmKeybd.c
index a89d16321..a48a1070d 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmKeybd.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmKeybd.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmKeybd.c,v 1.2 91/07/16 13:07:10 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmKeybd.h b/xc/programs/Xserver/hw/ibm/common/ibmKeybd.h
index f10249b47..317921141 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmKeybd.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmKeybd.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmKeybd.h,v 1.2 91/07/16 13:07:26 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmMalloc.c b/xc/programs/Xserver/hw/ibm/common/ibmMalloc.c
index 1dcafc3e9..dc70d6861 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmMalloc.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmMalloc.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmMalloc.c,v 1.2 91/07/16 13:08:10 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmMalloc.h b/xc/programs/Xserver/hw/ibm/common/ibmMalloc.h
index 3a182391c..0ebbbfdd7 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmMalloc.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmMalloc.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmMalloc.h,v 1.2 91/07/16 13:08:24 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmMouse.c b/xc/programs/Xserver/hw/ibm/common/ibmMouse.c
index b0c0c97d1..92bbfad3b 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmMouse.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmMouse.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmMouse.c,v 1.2 91/07/16 13:08:44 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmMouse.h b/xc/programs/Xserver/hw/ibm/common/ibmMouse.h
index 23e3f3d20..117eee2e7 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmMouse.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmMouse.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmMouse.h,v 1.2 91/07/16 13:09:05 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmPlumber.c b/xc/programs/Xserver/hw/ibm/common/ibmPlumber.c
index 44918fd51..bd7d65087 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmPlumber.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmPlumber.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmPlumber.c,v 1.2 91/07/16 13:09:22 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmQuery.c b/xc/programs/Xserver/hw/ibm/common/ibmQuery.c
index 10802bd9e..eecc057f6 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmQuery.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmQuery.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmQuery.c,v 1.2 91/07/16 13:09:39 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmSave.c b/xc/programs/Xserver/hw/ibm/common/ibmSave.c
index 2333f30fe..83e3c1908 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmSave.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmSave.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ibmSave.c,v 1.2 91/07/16 13:09:55 jap Exp $
+ * $XConsortium: ibmSave.c,v 1.3 93/07/12 09:27:19 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmScreen.c b/xc/programs/Xserver/hw/ibm/common/ibmScreen.c
index c0a71606f..0dd1e3421 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmScreen.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmScreen.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ibmScreen.c,v 1.2 91/07/16 13:10:14 jap Exp $
+ * $XConsortium: ibmScreen.c,v 1.3 91/09/09 13:23:20 rws Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmScreen.h b/xc/programs/Xserver/hw/ibm/common/ibmScreen.h
index 53cade1a5..46fafd9e3 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmScreen.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmScreen.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ibmScreen.h,v 1.2 91/07/16 13:10:29 jap Exp $
+ * $XConsortium: ibmScreen.h,v 1.3 91/09/09 13:23:39 rws Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmTrace.h b/xc/programs/Xserver/hw/ibm/common/ibmTrace.h
index dcca3eab6..5d9d6a2c1 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmTrace.h
+++ b/xc/programs/Xserver/hw/ibm/common/ibmTrace.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: ibmTrace.h,v 1.2 91/07/16 13:10:43 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/common/ibmUtils.c b/xc/programs/Xserver/hw/ibm/common/ibmUtils.c
index f7bfe1aa2..95fdb388e 100644
--- a/xc/programs/Xserver/hw/ibm/common/ibmUtils.c
+++ b/xc/programs/Xserver/hw/ibm/common/ibmUtils.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ibmUtils.c,v 1.4 93/09/05 15:39:53 rws Exp $
+ * $XConsortium: ibmUtils.c,v 1.5 93/09/26 12:39:35 rws Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/Imakefile b/xc/programs/Xserver/hw/ibm/pgc/Imakefile
index b3504e4eb..f5a50af28 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/Imakefile
+++ b/xc/programs/Xserver/hw/ibm/pgc/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 91/07/16 22:51:17 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.3 93/09/04 17:31:47 rws Exp $
#include <Server.tmpl>
SRCS = pgcGlobal.c pgcCmap.c pgcWindow.c pgcCpArea.c pgcPntWin.c
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgc.h b/xc/programs/Xserver/hw/ibm/pgc/pgc.h
index 16469cdf8..f7d51d9de 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgc.h
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgc.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: pgc.h,v 1.2 91/07/16 13:11:40 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgcCmap.c b/xc/programs/Xserver/hw/ibm/pgc/pgcCmap.c
index 6f06602b2..6c0844249 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgcCmap.c
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgcCmap.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: pgcCmap.c,v 1.2 91/07/16 13:11:53 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgcCpArea.c b/xc/programs/Xserver/hw/ibm/pgc/pgcCpArea.c
index b4452fa09..1574ed407 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgcCpArea.c
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgcCpArea.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: pgcCpArea.c,v 1.2 91/07/16 13:12:10 jap Exp $
+ * $XConsortium: pgcCpArea.c,v 1.3 94/01/07 09:50:55 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgcGlobal.c b/xc/programs/Xserver/hw/ibm/pgc/pgcGlobal.c
index c54ffc7fc..883c0633d 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgcGlobal.c
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgcGlobal.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: pgcGlobal.c,v 1.2 91/07/16 13:12:27 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgcPntWin.c b/xc/programs/Xserver/hw/ibm/pgc/pgcPntWin.c
index d68b9a544..e5e1c7b5b 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgcPntWin.c
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgcPntWin.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: pgcPntWin.c,v 1.2 91/07/16 13:12:44 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgcProcs.h b/xc/programs/Xserver/hw/ibm/pgc/pgcProcs.h
index 6c23337e8..3d32f3c8e 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgcProcs.h
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgcProcs.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyIO.c,v 1.1 91/05/10 09:09:03 jap Exp $
+ * $XConsortium: pgcProcs.h,v 1.2 91/07/16 13:12:57 jap Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/pgc/pgcWindow.c b/xc/programs/Xserver/hw/ibm/pgc/pgcWindow.c
index b9c09e41e..15cd8ecb2 100644
--- a/xc/programs/Xserver/hw/ibm/pgc/pgcWindow.c
+++ b/xc/programs/Xserver/hw/ibm/pgc/pgcWindow.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: pgcWindow.c,v 1.2 91/07/16 13:13:11 jap Exp $
+ * $XConsortium: pgcWindow.c,v 1.3 94/01/07 09:51:04 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/Imakefile b/xc/programs/Xserver/hw/ibm/skyway/Imakefile
index 114092c71..7284743e3 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/Imakefile
+++ b/xc/programs/Xserver/hw/ibm/skyway/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.8 92/11/23 10:25:09 eswu Exp $
+XCOMM $XConsortium: Imakefile,v 1.9 93/09/04 17:32:27 rws Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/ibm/skyway/copyword.s b/xc/programs/Xserver/hw/ibm/skyway/copyword.s
index 65740f094..09d333c01 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/copyword.s
+++ b/xc/programs/Xserver/hw/ibm/skyway/copyword.s
@@ -1,5 +1,5 @@
/*
- * $XConsortium: $
+ * $XConsortium: copyword.s,v 1.2 91/12/11 21:37:24 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyBitBlt.c b/xc/programs/Xserver/hw/ibm/skyway/skyBitBlt.c
index c65025c2c..ef69a6e2f 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyBitBlt.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyBitBlt.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyBitBlt.c,v 1.5 93/09/13 09:38:22 dpw Exp $
+ * $XConsortium: skyBitBlt.c,v 1.6 94/04/17 20:29:20 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyCmap.c b/xc/programs/Xserver/hw/ibm/skyway/skyCmap.c
index 02163e7d0..5f0157f51 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyCmap.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyCmap.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyCmap.c,v 1.2 91/07/16 13:13:47 jap Exp $
+ * $XConsortium: skyCmap.c,v 1.3 91/12/11 21:23:39 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyCur.c b/xc/programs/Xserver/hw/ibm/skyway/skyCur.c
index 9fb16567c..92b4f1a4c 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyCur.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyCur.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyCur.c,v 1.3 91/07/16 13:14:04 jap Exp $
+ * $XConsortium: skyCur.c,v 1.4 91/12/11 21:23:51 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyFill.c b/xc/programs/Xserver/hw/ibm/skyway/skyFill.c
index 5405df30e..b56850d84 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyFill.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyFill.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyFill.c,v 1.2 91/12/11 21:40:47 eswu Exp $
+ * $XConsortium: skyFill.c,v 1.3 92/01/27 18:03:17 eswu Exp $
*
* Copyright IBM Corporation 1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyFillRct.c b/xc/programs/Xserver/hw/ibm/skyway/skyFillRct.c
index 72d129b87..4aa74796b 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyFillRct.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyFillRct.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyFillRct.c,v 1.4 94/01/07 09:51:37 dpw Exp $
+ * $XConsortium: skyFillRct.c,v 1.5 94/04/17 20:29:21 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.c b/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.c
index 49fc900be..c32b21d46 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyHdwr.c,v 1.5 91/10/17 14:42:17 eswu Exp $
+ * $XConsortium: skyHdwr.c,v 1.6 91/12/11 21:24:50 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.h b/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.h
index 47756ed3a..94c9e24d1 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.h
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyHdwr.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyHdwr.h,v 1.5 92/01/27 18:03:02 eswu Exp $
+ * $XConsortium: skyHdwr.h,v 1.6 92/11/23 10:24:12 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyInfo.c b/xc/programs/Xserver/hw/ibm/skyway/skyInfo.c
index 05010c76a..84ef3cef5 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyInfo.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyInfo.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyInfo.c,v 1.3 91/07/16 13:15:33 jap Exp $
+ * $XConsortium: skyInfo.c,v 1.4 91/12/11 21:25:09 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyPriv.h b/xc/programs/Xserver/hw/ibm/skyway/skyPriv.h
index c1742405c..679865283 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyPriv.h
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyPriv.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: $
+ * $XConsortium: skyPriv.h,v 1.2 91/12/11 21:40:52 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyProbe.c b/xc/programs/Xserver/hw/ibm/skyway/skyProbe.c
index 15f46eff5..73b41429e 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyProbe.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyProbe.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyProbe.c,v 1.2 91/07/16 13:15:46 jap Exp $
+ * $XConsortium: skyProbe.c,v 1.3 91/12/11 21:25:30 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyProcs.h b/xc/programs/Xserver/hw/ibm/skyway/skyProcs.h
index 11c26f14e..da3bc2ea6 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyProcs.h
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyProcs.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyProcs.h,v 1.3 91/07/16 13:15:59 jap Exp $
+ * $XConsortium: skyProcs.h,v 1.4 91/12/11 21:25:38 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyReg.h b/xc/programs/Xserver/hw/ibm/skyway/skyReg.h
index 2e35b037b..fdbb7216f 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyReg.h
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyReg.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyReg.h,v 1.4 92/01/27 18:01:20 eswu Exp $
+ * $XConsortium: skyReg.h,v 1.5 94/02/06 17:47:06 rws Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skySGC.c b/xc/programs/Xserver/hw/ibm/skyway/skySGC.c
index c755071a2..a80b2d3e6 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skySGC.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skySGC.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skySGC.c,v 1.8 94/01/07 09:51:25 dpw Exp $
+ * $XConsortium: skySGC.c,v 1.9 94/04/17 20:29:22 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skySave.c b/xc/programs/Xserver/hw/ibm/skyway/skySave.c
index 985dacbb4..9c68273a4 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skySave.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skySave.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skySave.c,v 1.3 91/07/16 13:16:46 jap Exp $
+ * $XConsortium: skySave.c,v 1.4 91/12/11 21:25:50 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyScrInit.c b/xc/programs/Xserver/hw/ibm/skyway/skyScrInit.c
index bd694927d..e2b4a345a 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyScrInit.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyScrInit.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyScrInit.c,v 1.5 92/01/27 18:03:20 eswu Exp $
+ * $XConsortium: skyScrInit.c,v 1.6 92/11/23 10:23:45 eswu Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/ibm/skyway/skyWin.c b/xc/programs/Xserver/hw/ibm/skyway/skyWin.c
index 576d00c49..fcb88fc7a 100644
--- a/xc/programs/Xserver/hw/ibm/skyway/skyWin.c
+++ b/xc/programs/Xserver/hw/ibm/skyway/skyWin.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: skyWin.c,v 1.3 94/01/07 09:51:40 dpw Exp $
+ * $XConsortium: skyWin.c,v 1.4 94/04/17 20:29:23 dpw Exp $
*
* Copyright IBM Corporation 1987,1988,1989,1990,1991
*
diff --git a/xc/programs/Xserver/hw/macII/Imakefile b/xc/programs/Xserver/hw/macII/Imakefile
index 9f87444e3..326a51434 100644
--- a/xc/programs/Xserver/hw/macII/Imakefile
+++ b/xc/programs/Xserver/hw/macII/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.24 94/01/28 22:29:49 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.25 94/02/06 11:32:25 rws Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/macII/XmacII.man b/xc/programs/Xserver/hw/macII/XmacII.man
index acdfeec6c..3c04e1199 100644
--- a/xc/programs/Xserver/hw/macII/XmacII.man
+++ b/xc/programs/Xserver/hw/macII/XmacII.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: XmacII.man,v 1.12 94/04/17 20:29:24 matt Exp $
+.\" $XConsortium: XmacII.man,v 1.13 94/04/18 18:05:17 rws Exp $
.\" Copyright (c) 1989 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/Xserver/hw/macII/macII.h b/xc/programs/Xserver/hw/macII/macII.h
index 9401f5767..5d1b7312f 100644
--- a/xc/programs/Xserver/hw/macII/macII.h
+++ b/xc/programs/Xserver/hw/macII/macII.h
@@ -34,7 +34,7 @@ IMPLIED.
* software for any purpose. It is provided "as is" without
* express or implied warranty.
*
- * $XConsortium: macII.h,v 1.17 91/05/14 16:25:08 rws Exp $
+ * $XConsortium: macII.h,v 1.19 94/01/28 22:30:02 rws Exp $
*/
#ifndef _MACII_H_
#define _MACII_H_
diff --git a/xc/programs/Xserver/hw/macII/macIIKbd.c b/xc/programs/Xserver/hw/macII/macIIKbd.c
index e63d7d8db..46fb145a1 100644
--- a/xc/programs/Xserver/hw/macII/macIIKbd.c
+++ b/xc/programs/Xserver/hw/macII/macIIKbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: macIIKbd.c,v 1.23 94/02/23 15:55:35 dpw Exp $ */
+/* $XConsortium: macIIKbd.c,v 1.24 94/04/17 20:29:29 dpw Exp $ */
/*****************************************************************************
Copyright 1988-1993 by Apple Computer, Inc, Cupertino, California
All Rights Reserved
diff --git a/xc/programs/Xserver/hw/omron/omron.h b/xc/programs/Xserver/hw/omron/omron.h
index 32ffaabfc..895104529 100644
--- a/xc/programs/Xserver/hw/omron/omron.h
+++ b/xc/programs/Xserver/hw/omron/omron.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omron.h,v 1.3 94/02/04 19:37:26 dpw Exp kaleb $
+ * $XConsortium: omron.h,v 1.4 95/04/05 19:58:44 kaleb Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omron88kBm.c b/xc/programs/Xserver/hw/omron/omron88kBm.c
index 608d62011..46f76fc95 100644
--- a/xc/programs/Xserver/hw/omron/omron88kBm.c
+++ b/xc/programs/Xserver/hw/omron/omron88kBm.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omron88kBm.c,v 1.1 91/06/29 13:48:52 xguest Exp $
+ * $XConsortium: omron88kBm.c,v 1.2 93/09/03 19:31:25 dpw Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronDtBm.c b/xc/programs/Xserver/hw/omron/omronDtBm.c
index 18a54f240..d6cae9df2 100644
--- a/xc/programs/Xserver/hw/omron/omronDtBm.c
+++ b/xc/programs/Xserver/hw/omron/omronDtBm.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omronDtBm.c,v 1.1 91/06/29 13:48:53 xguest Exp $
+ * $XConsortium: omronDtBm.c,v 1.2 93/09/03 19:50:05 dpw Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronFb.h b/xc/programs/Xserver/hw/omron/omronFb.h
index 979e48b0d..38cfb9598 100644
--- a/xc/programs/Xserver/hw/omron/omronFb.h
+++ b/xc/programs/Xserver/hw/omron/omronFb.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium$
+ * $XConsortium: omronFb.h,v 1.1 91/06/29 13:48:54 xguest Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronFsBm.c b/xc/programs/Xserver/hw/omron/omronFsBm.c
index 06be12550..b62ddf75a 100644
--- a/xc/programs/Xserver/hw/omron/omronFsBm.c
+++ b/xc/programs/Xserver/hw/omron/omronFsBm.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omronFsBm.c,v 1.1 91/06/29 13:48:56 xguest Exp $
+ * $XConsortium: omronFsBm.c,v 1.2 93/09/03 19:50:18 dpw Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronInit.c b/xc/programs/Xserver/hw/omron/omronInit.c
index df9227329..70e62a393 100644
--- a/xc/programs/Xserver/hw/omron/omronInit.c
+++ b/xc/programs/Xserver/hw/omron/omronInit.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omronInit.c,v 1.2 93/09/26 12:29:39 rws Exp $
+ * $XConsortium: omronInit.c,v 1.3 94/02/23 15:56:12 dpw Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronIo.c b/xc/programs/Xserver/hw/omron/omronIo.c
index 209a440e8..0a285fde1 100644
--- a/xc/programs/Xserver/hw/omron/omronIo.c
+++ b/xc/programs/Xserver/hw/omron/omronIo.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omronIo.c,v 1.1 91/06/29 13:48:58 xguest Exp kaleb $
+ * $XConsortium: omronIo.c,v 1.2 95/04/05 19:58:42 kaleb Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronKMap.c b/xc/programs/Xserver/hw/omron/omronKMap.c
index 1c2de43c4..a83e4ff63 100644
--- a/xc/programs/Xserver/hw/omron/omronKMap.c
+++ b/xc/programs/Xserver/hw/omron/omronKMap.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium$
+ * $XConsortium: omronKMap.c,v 1.1 91/06/29 13:48:59 xguest Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronKbd.c b/xc/programs/Xserver/hw/omron/omronKbd.c
index f0edbc2ab..b6c1c7c8a 100644
--- a/xc/programs/Xserver/hw/omron/omronKbd.c
+++ b/xc/programs/Xserver/hw/omron/omronKbd.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: omronKbd.c,v 1.4 94/04/01 18:49:22 erik Exp dpw $
+ * $XConsortium: omronKbd.c,v 1.5 94/08/16 13:49:40 dpw Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronKbd.h b/xc/programs/Xserver/hw/omron/omronKbd.h
index 0cad92e64..80016d0b2 100644
--- a/xc/programs/Xserver/hw/omron/omronKbd.h
+++ b/xc/programs/Xserver/hw/omron/omronKbd.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium$
+ * $XConsortium: omronKbd.h,v 1.1 91/06/29 13:49:02 xguest Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronMouse.c b/xc/programs/Xserver/hw/omron/omronMouse.c
index 6b4c93b3a..3cb06d1ee 100644
--- a/xc/programs/Xserver/hw/omron/omronMouse.c
+++ b/xc/programs/Xserver/hw/omron/omronMouse.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium$
+ * $XConsortium: omronMouse.c,v 1.1 91/06/29 13:49:03 xguest Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronMouse.h b/xc/programs/Xserver/hw/omron/omronMouse.h
index 22a727c38..46d0b620d 100644
--- a/xc/programs/Xserver/hw/omron/omronMouse.h
+++ b/xc/programs/Xserver/hw/omron/omronMouse.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium$
+ * $XConsortium: omronMouse.h,v 1.1 91/06/29 13:49:05 xguest Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/omron/omronUtils.c b/xc/programs/Xserver/hw/omron/omronUtils.c
index dec7b38f3..41d277a1f 100644
--- a/xc/programs/Xserver/hw/omron/omronUtils.c
+++ b/xc/programs/Xserver/hw/omron/omronUtils.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium$
+ * $XConsortium: omronUtils.c,v 1.1 91/06/29 13:49:07 xguest Exp $
*
* Copyright 1991 by OMRON Corporation
*
diff --git a/xc/programs/Xserver/hw/sun/Imakefile b/xc/programs/Xserver/hw/sun/Imakefile
index 6cf308a6f..6ec5de587 100644
--- a/xc/programs/Xserver/hw/sun/Imakefile
+++ b/xc/programs/Xserver/hw/sun/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.26 94/06/06 14:12:06 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 5.27 94/07/28 16:44:16 dpw Exp $
#include <Server.tmpl>
SRCS1 = sunInit.c \
diff --git a/xc/programs/Xserver/hw/sun/Xsun.man b/xc/programs/Xserver/hw/sun/Xsun.man
index a6ddf10e3..59e65b050 100644
--- a/xc/programs/Xserver/hw/sun/Xsun.man
+++ b/xc/programs/Xserver/hw/sun/Xsun.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: Xsun.man,v 1.23 94/04/17 20:29:32 gildea Exp $
+.\" $XConsortium: Xsun.man,v 1.24 94/06/06 14:13:56 kaleb Exp $
.\" Copyright 1988 Sun Microsystems, Inc.
.\" Copyright (c) 1993, 1994 X Consortium
.\"
diff --git a/xc/programs/Xserver/hw/sun/constype.c b/xc/programs/Xserver/hw/sun/constype.c
index 40e11433d..66760e598 100644
--- a/xc/programs/Xserver/hw/sun/constype.c
+++ b/xc/programs/Xserver/hw/sun/constype.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: constype.c,v 1.5 92/11/18 14:10:04 rws Exp kaleb $
+ * $XConsortium: constype.c,v 1.6 95/01/05 20:01:06 kaleb Exp $
*
* consoletype - utility to print out string identifying Sun console type
*
diff --git a/xc/programs/Xserver/hw/sun/constype.man b/xc/programs/Xserver/hw/sun/constype.man
index 337614761..63c553ceb 100644
--- a/xc/programs/Xserver/hw/sun/constype.man
+++ b/xc/programs/Xserver/hw/sun/constype.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: constype.man,v 1.8 93/08/02 11:12:55 gildea Exp $
+.\" $XConsortium: constype.man,v 1.9 94/04/11 14:27:46 gildea Exp $
.TH CONSTYPE 1 "Release 6" "X Version 11"
.SH NAME
constype - print type of Sun console
diff --git a/xc/programs/Xserver/hw/sun/kbd_mode.c b/xc/programs/Xserver/hw/sun/kbd_mode.c
index 077f3e9a9..bba263b5c 100644
--- a/xc/programs/Xserver/hw/sun/kbd_mode.c
+++ b/xc/programs/Xserver/hw/sun/kbd_mode.c
@@ -1,4 +1,4 @@
-/* $XConsortium: kbd_mode.c,v 4.6 94/04/17 20:29:33 kaleb Exp kaleb $ */
+/* $XConsortium: kbd_mode.c,v 4.7 95/01/05 20:03:44 kaleb Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/sun/kbd_mode.man b/xc/programs/Xserver/hw/sun/kbd_mode.man
index 0ea13808f..4400a911e 100644
--- a/xc/programs/Xserver/hw/sun/kbd_mode.man
+++ b/xc/programs/Xserver/hw/sun/kbd_mode.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: kbd_mode.man,v 1.9 94/04/13 18:41:23 gildea Exp $
+.\" $XConsortium: kbd_mode.man,v 1.10 94/04/17 20:29:33 gildea Exp $
.\" Copyright 1987 Sun Microsystems, Inc.
.\" Copyright (c) 1993 X Consortium
.\"
diff --git a/xc/programs/Xserver/hw/sun/sun.h b/xc/programs/Xserver/hw/sun/sun.h
index e4705949c..39b5cd61f 100644
--- a/xc/programs/Xserver/hw/sun/sun.h
+++ b/xc/programs/Xserver/hw/sun/sun.h
@@ -1,5 +1,5 @@
-/* $XConsortium: sun.h,v 5.40 94/10/17 14:16:02 kaleb Exp kaleb $ */
+/* $XConsortium: sun.h,v 5.41 95/01/05 19:54:08 kaleb Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
diff --git a/xc/programs/Xserver/hw/sun/sunCfb.c b/xc/programs/Xserver/hw/sun/sunCfb.c
index d48c94d8c..17abe02f4 100644
--- a/xc/programs/Xserver/hw/sun/sunCfb.c
+++ b/xc/programs/Xserver/hw/sun/sunCfb.c
@@ -1,5 +1,5 @@
-/* $XConsortium: sunCfb.c,v 1.16 94/07/28 15:44:29 dpw Exp kaleb $ */
+/* $XConsortium: sunCfb.c,v 1.17 95/01/05 20:09:41 kaleb Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/hw/sun/sunCfb24.c b/xc/programs/Xserver/hw/sun/sunCfb24.c
index 937301542..faf947e51 100644
--- a/xc/programs/Xserver/hw/sun/sunCfb24.c
+++ b/xc/programs/Xserver/hw/sun/sunCfb24.c
@@ -1,5 +1,5 @@
-/* $XConsortium: sunCfb24.c,v 1.2 94/02/21 10:21:05 kaleb Exp $ */
+/* $XConsortium: sunCfb24.c,v 1.3 94/04/05 11:29:31 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/sun/sunCursor.c b/xc/programs/Xserver/hw/sun/sunCursor.c
index 300f4fafd..b99d65676 100644
--- a/xc/programs/Xserver/hw/sun/sunCursor.c
+++ b/xc/programs/Xserver/hw/sun/sunCursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunCursor.c,v 5.18 94/04/13 18:23:17 gildea Exp $ */
+/* $XConsortium: sunCursor.c,v 5.19 94/04/17 20:29:35 gildea Exp $ */
/*
Copyright (c) 1988 Sun Microsystems, Inc.
diff --git a/xc/programs/Xserver/hw/sun/sunFbs.c b/xc/programs/Xserver/hw/sun/sunFbs.c
index 324edb090..20da934ac 100644
--- a/xc/programs/Xserver/hw/sun/sunFbs.c
+++ b/xc/programs/Xserver/hw/sun/sunFbs.c
@@ -1,5 +1,5 @@
-/* $XConsortium: sunFbs.c,v 1.7 94/04/17 20:29:37 dpw Exp dpw $ */
+/* $XConsortium: sunFbs.c,v 1.8 94/08/16 13:45:30 dpw Exp $ */
/*
Copyright (c) 1990, 1993 X Consortium
diff --git a/xc/programs/Xserver/hw/sun/sunGX.c b/xc/programs/Xserver/hw/sun/sunGX.c
index 981f485f3..b56e26875 100644
--- a/xc/programs/Xserver/hw/sun/sunGX.c
+++ b/xc/programs/Xserver/hw/sun/sunGX.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char *rid="$XConsortium: sunGX.c,v 1.26 94/04/17 20:29:38 kaleb Exp dpw $";
+static char *rid="$XConsortium: sunGX.c,v 1.27 95/06/15 18:32:58 dpw Exp $";
#endif /* lint */
/*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/sun/sunGX.h b/xc/programs/Xserver/hw/sun/sunGX.h
index dec9131ce..730e66ef2 100644
--- a/xc/programs/Xserver/hw/sun/sunGX.h
+++ b/xc/programs/Xserver/hw/sun/sunGX.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: sunGX.h,v 1.3 92/11/24 11:36:13 rws Exp $
+ * $XConsortium: sunGX.h,v 1.4 94/04/17 20:29:39 rws Exp $
*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/hw/sun/sunInit.c b/xc/programs/Xserver/hw/sun/sunInit.c
index e70f5bbdb..5002bcb76 100644
--- a/xc/programs/Xserver/hw/sun/sunInit.c
+++ b/xc/programs/Xserver/hw/sun/sunInit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunInit.c,v 5.53 94/08/16 13:45:30 dpw Exp kaleb $ */
+/* $XConsortium: sunInit.c,v 5.54 94/12/23 16:49:38 kaleb Exp $ */
/*
* sunInit.c --
* Initialization functions for screen/keyboard/mouse, etc.
diff --git a/xc/programs/Xserver/hw/sun/sunIo.c b/xc/programs/Xserver/hw/sun/sunIo.c
index b16530b10..33bdfce32 100644
--- a/xc/programs/Xserver/hw/sun/sunIo.c
+++ b/xc/programs/Xserver/hw/sun/sunIo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunIo.c,v 5.29 95/01/12 18:59:25 kaleb Exp kaleb $ */
+/* $XConsortium: sunIo.c,v 5.30 95/01/25 23:04:28 kaleb Exp $ */
/*-
* sunIo.c --
* Functions to handle input from the keyboard and mouse.
diff --git a/xc/programs/Xserver/hw/sun/sunKbd.c b/xc/programs/Xserver/hw/sun/sunKbd.c
index 59b392a9f..279d9cc63 100644
--- a/xc/programs/Xserver/hw/sun/sunKbd.c
+++ b/xc/programs/Xserver/hw/sun/sunKbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunKbd.c,v 5.48 94/10/16 16:10:44 kaleb Exp kaleb $ */
+/* $XConsortium: sunKbd.c,v 5.49 94/10/17 14:18:23 kaleb Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
*
diff --git a/xc/programs/Xserver/hw/sun/sunKeyMap.c b/xc/programs/Xserver/hw/sun/sunKeyMap.c
index b75982d95..6ac816d0b 100644
--- a/xc/programs/Xserver/hw/sun/sunKeyMap.c
+++ b/xc/programs/Xserver/hw/sun/sunKeyMap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunKeyMap.c,v 4.23 95/06/22 18:09:59 kaleb Exp kaleb $ */
+/* $XConsortium: sunKeyMap.c,v 4.24 95/07/07 19:58:00 kaleb Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/sun/sunMfb.c b/xc/programs/Xserver/hw/sun/sunMfb.c
index fb7eb2220..b811891f3 100644
--- a/xc/programs/Xserver/hw/sun/sunMfb.c
+++ b/xc/programs/Xserver/hw/sun/sunMfb.c
@@ -1,5 +1,5 @@
-/* $XConsortium: sunMfb.c,v 1.4 94/04/17 20:29:46 kaleb Exp kaleb $ */
+/* $XConsortium: sunMfb.c,v 1.5 95/01/05 20:15:41 kaleb Exp $ */
/*
Copyright (c) 1990, 1993 X Consortium
diff --git a/xc/programs/Xserver/hw/sun/sunMouse.c b/xc/programs/Xserver/hw/sun/sunMouse.c
index dcdd1f542..da8311d38 100644
--- a/xc/programs/Xserver/hw/sun/sunMouse.c
+++ b/xc/programs/Xserver/hw/sun/sunMouse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunMouse.c,v 5.22 94/10/17 14:16:02 kaleb Exp kaleb $ */
+/* $XConsortium: sunMouse.c,v 5.23 95/01/16 20:05:22 kaleb Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
*
diff --git a/xc/programs/Xserver/hw/sun/sunMultiDepth.c b/xc/programs/Xserver/hw/sun/sunMultiDepth.c
index b1c9c5d15..d0ae49612 100644
--- a/xc/programs/Xserver/hw/sun/sunMultiDepth.c
+++ b/xc/programs/Xserver/hw/sun/sunMultiDepth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunMultiDepth.c,v 1.1 94/02/07 08:54:54 dpw Exp $ */
+/* $XConsortium: sunMultiDepth.c,v 1.2 94/04/17 20:29:48 dpw Exp $ */
/*
Copyright (c) 1992 X Consortium
diff --git a/xc/programs/Xserver/hw/sunAmoeba/Imakefile b/xc/programs/Xserver/hw/sunAmoeba/Imakefile
index 26b78838c..141a2b083 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/Imakefile
+++ b/xc/programs/Xserver/hw/sunAmoeba/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/04/01 17:54:31 dpw Exp $
#include <Server.tmpl>
SRCS1 = sunAmInit.c \
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sun.h b/xc/programs/Xserver/hw/sunAmoeba/sun.h
index c90cd402f..98d9feabb 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sun.h
+++ b/xc/programs/Xserver/hw/sunAmoeba/sun.h
@@ -1,5 +1,5 @@
-/* $XConsortium: sun.h,v 5.37 94/03/16 16:44:21 kaleb Exp $ */
+/* $XConsortium: sun.h,v 5.37 94/04/01 17:54:37 dpw Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunAmInit.c b/xc/programs/Xserver/hw/sunAmoeba/sunAmInit.c
index 1b3f3f36f..e2e48f85f 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunAmInit.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunAmInit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunAmInit.c,v 1.1 94/04/01 17:54:43 dpw Exp $ */
+/* $XConsortium: sunAmInit.c,v 1.2 94/04/17 20:32:46 dpw Exp $ */
/*
* sunAmInit.c --
* Amoeba implementation of initialization functions
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunAmIo.c b/xc/programs/Xserver/hw/sunAmoeba/sunAmIo.c
index 74584d56b..6624d6ff9 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunAmIo.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunAmIo.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: sunAmIo.c,v 1.1 94/04/01 17:54:49 dpw Exp $ */
/*-
* sunAmIo.c --
* Amoeba implementation of functions to handle input from
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunAmKbd.c b/xc/programs/Xserver/hw/sunAmoeba/sunAmKbd.c
index 38667edb7..045bb2f84 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunAmKbd.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunAmKbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunAmKbd.c,v 1.1 94/04/01 17:54:55 dpw Exp $ */
+/* $XConsortium: sunAmKbd.c,v 1.2 94/04/17 20:32:47 dpw Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
*
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunAmMouse.c b/xc/programs/Xserver/hw/sunAmoeba/sunAmMouse.c
index c47cddc6e..999e27ef9 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunAmMouse.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunAmMouse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunAmMouse.c,v 1.1 94/04/01 17:55:01 dpw Exp $ */
+/* $XConsortium: sunAmMouse.c,v 1.2 94/04/17 20:32:48 dpw Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunAmProbe.c b/xc/programs/Xserver/hw/sunAmoeba/sunAmProbe.c
index 5782e7d2f..f0e295925 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunAmProbe.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunAmProbe.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunAmProbe.c,v 1.1 94/04/01 17:55:07 dpw Exp $ */
+/* $XConsortium: sunAmProbe.c,v 1.2 94/04/17 20:32:48 dpw Exp $ */
/*-
* sunAmProbe.c:
* Amoeba implementation of functions to probe and map in the
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunAmScreen.c b/xc/programs/Xserver/hw/sunAmoeba/sunAmScreen.c
index abee04360..35a8c5a2f 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunAmScreen.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunAmScreen.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: sunAmScreen.c,v 1.1 94/04/01 17:55:13 dpw Exp $ */
/*
* Copyright 1993 Vrije Universiteit, The Netherlands
*
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunCfb.c b/xc/programs/Xserver/hw/sunAmoeba/sunCfb.c
index b323727b9..04fddeab7 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunCfb.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunCfb.c
@@ -1,5 +1,5 @@
-/* $XConsortium: sunCfb.c,v 1.12 94/04/01 17:55:18 dpw Exp $ */
+/* $XConsortium: sunCfb.c,v 1.13 94/04/17 20:32:49 dpw Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunCursor.c b/xc/programs/Xserver/hw/sunAmoeba/sunCursor.c
index 0fede9d68..37cd223fb 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunCursor.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunCursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sunCursor.c,v 5.17 94/01/07 09:52:21 dpw Exp $ */
+/* $XConsortium: sunCursor.c,v 5.17 94/04/01 17:55:24 dpw Exp $ */
/*-
* sunCursor.c --
* Functions for maintaining the Sun software cursor...
diff --git a/xc/programs/Xserver/hw/sunAmoeba/sunFbs.c b/xc/programs/Xserver/hw/sunAmoeba/sunFbs.c
index 48aa2d6cb..3555df22a 100644
--- a/xc/programs/Xserver/hw/sunAmoeba/sunFbs.c
+++ b/xc/programs/Xserver/hw/sunAmoeba/sunFbs.c
@@ -1,5 +1,5 @@
-/* $XConsortium: sunFbs.c,v 1.6 94/04/01 17:55:30 dpw Exp $ */
+/* $XConsortium: sunFbs.c,v 1.7 94/04/17 20:32:50 dpw Exp $ */
/*
Copyright (c) 1990, 1993 X Consortium
diff --git a/xc/programs/Xserver/hw/svga/Imakefile b/xc/programs/Xserver/hw/svga/Imakefile
index 598e2d2b2..445346796 100644
--- a/xc/programs/Xserver/hw/svga/Imakefile
+++ b/xc/programs/Xserver/hw/svga/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 93/09/19 09:39:53 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.3 93/09/20 13:17:27 rws Exp $
XCOMM
XCOMM Copyright 1993,94 by Thomas Roell, Germany.
XCOMM Copyright 1993,94 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/atKeynames.h b/xc/programs/Xserver/hw/svga/atKeynames.h
index 9ba8b2fd3..ee7340487 100644
--- a/xc/programs/Xserver/hw/svga/atKeynames.h
+++ b/xc/programs/Xserver/hw/svga/atKeynames.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: atKeynames.h,v 1.1 93/09/18 16:08:08 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/compiler.h b/xc/programs/Xserver/hw/svga/compiler.h
index 41be866d6..b047a4669 100644
--- a/xc/programs/Xserver/hw/svga/compiler.h
+++ b/xc/programs/Xserver/hw/svga/compiler.h
@@ -1,4 +1,4 @@
-/* $XConsortium: compiler.h,v 1.2 93/09/19 09:41:53 rws Exp $ */
+/* $XConsortium: compiler.h,v 1.3 94/01/18 19:34:43 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/config/Imakefile b/xc/programs/Xserver/hw/svga/config/Imakefile
index 08c71f04e..f130bfc44 100644
--- a/xc/programs/Xserver/hw/svga/config/Imakefile
+++ b/xc/programs/Xserver/hw/svga/config/Imakefile
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: Imakefile,v 1.1 93/09/20 13:18:23 rws Exp $ */
#ifndef SvgaDir
#define SvgaDir $(LIBDIR)/svga
diff --git a/xc/programs/Xserver/hw/svga/config/vga.pmi b/xc/programs/Xserver/hw/svga/config/vga.pmi
index 57dd44118..f757d5481 100644
--- a/xc/programs/Xserver/hw/svga/config/vga.pmi
+++ b/xc/programs/Xserver/hw/svga/config/vga.pmi
@@ -1,4 +1,4 @@
-// $XConsortium$
+// $XConsortium: vga.pmi,v 1.3 93/09/19 19:38:08 rws Exp $
// This is a sample SVPMI file usable for every S3 chipset. It contains
// a textmode and 640x480, 800x600 & 1024 256 colors mode.
//
diff --git a/xc/programs/Xserver/hw/svga/svga.h b/xc/programs/Xserver/hw/svga/svga.h
index dfc610cd4..59a8eb8dd 100644
--- a/xc/programs/Xserver/hw/svga/svga.h
+++ b/xc/programs/Xserver/hw/svga/svga.h
@@ -1,4 +1,4 @@
-/* $XConsortium: svga.h,v 1.1 93/09/18 16:07:49 rws Exp $ */
+/* $XConsortium: svga.h,v 1.2 93/09/18 18:18:14 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svga386.s b/xc/programs/Xserver/hw/svga/svga386.s
index 34e00e601..c444c498c 100644
--- a/xc/programs/Xserver/hw/svga/svga386.s
+++ b/xc/programs/Xserver/hw/svga/svga386.s
@@ -1,4 +1,4 @@
-/ $XConsortium$
+/ $XConsortium: svga386.s,v 1.1 93/09/19 09:43:13 rws Exp $
/ Copyright 1990,91,92,93 by Thomas Roell, Germany.
/ Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
/
diff --git a/xc/programs/Xserver/hw/svga/svgaBank.c b/xc/programs/Xserver/hw/svga/svgaBank.c
index d7f42cc26..8cb651a80 100644
--- a/xc/programs/Xserver/hw/svga/svgaBank.c
+++ b/xc/programs/Xserver/hw/svga/svgaBank.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaBank.c,v 1.7 93/10/12 11:26:35 dpw Exp $ */
+/* $XConsortium: svgaBank.c,v 1.8 94/01/07 09:53:07 dpw Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaColor.c b/xc/programs/Xserver/hw/svga/svgaColor.c
index 57962f6b2..c475e9073 100644
--- a/xc/programs/Xserver/hw/svga/svgaColor.c
+++ b/xc/programs/Xserver/hw/svga/svgaColor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaColor.c,v 1.3 93/09/20 12:06:02 rws Exp $ */
+/* $XConsortium: svgaColor.c,v 1.4 94/03/19 17:26:54 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaFb.c b/xc/programs/Xserver/hw/svga/svgaFb.c
index 74d587713..f3eaafaea 100644
--- a/xc/programs/Xserver/hw/svga/svgaFb.c
+++ b/xc/programs/Xserver/hw/svga/svgaFb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaFb.c,v 1.3 93/09/20 14:05:32 rws Exp $ */
+/* $XConsortium: svgaFb.c,v 1.4 93/10/12 11:26:00 dpw Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaInit.c b/xc/programs/Xserver/hw/svga/svgaInit.c
index 627675f6c..2f107b8b9 100644
--- a/xc/programs/Xserver/hw/svga/svgaInit.c
+++ b/xc/programs/Xserver/hw/svga/svgaInit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaInit.c,v 1.7 93/09/26 11:18:13 rws Exp $ */
+/* $XConsortium: svgaInit.c,v 1.8 93/09/26 12:26:33 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaIo.c b/xc/programs/Xserver/hw/svga/svgaIo.c
index 624d6874a..0a2fe2fcc 100644
--- a/xc/programs/Xserver/hw/svga/svgaIo.c
+++ b/xc/programs/Xserver/hw/svga/svgaIo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaIo.c,v 1.6 93/10/12 11:26:15 dpw Exp $ */
+/* $XConsortium: svgaIo.c,v 1.7 93/10/19 16:44:37 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaKbd.c b/xc/programs/Xserver/hw/svga/svgaKbd.c
index 7e5ebef70..a3b8ea8d4 100644
--- a/xc/programs/Xserver/hw/svga/svgaKbd.c
+++ b/xc/programs/Xserver/hw/svga/svgaKbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaKbd.c,v 1.1 93/09/18 16:07:55 rws Exp $ */
+/* $XConsortium: svgaKbd.c,v 1.2 94/02/24 10:44:35 dpw Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaSVPMI.c b/xc/programs/Xserver/hw/svga/svgaSVPMI.c
index 163939c4f..e19f98765 100644
--- a/xc/programs/Xserver/hw/svga/svgaSVPMI.c
+++ b/xc/programs/Xserver/hw/svga/svgaSVPMI.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaSVPMI.c,v 1.3 93/09/20 13:18:08 rws Exp $ */
+/* $XConsortium: svgaSVPMI.c,v 1.4 94/03/27 12:20:10 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/svga/svgaVT.c b/xc/programs/Xserver/hw/svga/svgaVT.c
index 3a12ee0d6..f99e3cd0b 100644
--- a/xc/programs/Xserver/hw/svga/svgaVT.c
+++ b/xc/programs/Xserver/hw/svga/svgaVT.c
@@ -1,4 +1,4 @@
-/* $XConsortium: svgaVT.c,v 1.2 93/09/18 18:18:01 rws Exp $ */
+/* $XConsortium: svgaVT.c,v 1.3 93/09/20 12:07:43 rws Exp $ */
/*
* Copyright 1990,91,92,93 by Thomas Roell, Germany.
* Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA.
diff --git a/xc/programs/Xserver/hw/vfb/Imakefile b/xc/programs/Xserver/hw/vfb/Imakefile
index f73d96e77..6ac0898cc 100644
--- a/xc/programs/Xserver/hw/vfb/Imakefile
+++ b/xc/programs/Xserver/hw/vfb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 94/01/12 18:02:20 dpw Exp $
+XCOMM $XConsortium: Imakefile,v 1.5 94/01/21 22:04:27 dpw Exp $
#include <Server.tmpl>
#if HasShm
diff --git a/xc/programs/Xserver/hw/vfb/InitInput.c b/xc/programs/Xserver/hw/vfb/InitInput.c
index a0d0c424c..da39d0a1b 100644
--- a/xc/programs/Xserver/hw/vfb/InitInput.c
+++ b/xc/programs/Xserver/hw/vfb/InitInput.c
@@ -1,4 +1,4 @@
-/* $XConsortium: InitInput.c,v 1.6 94/04/17 20:30:24 dpw Exp $ */
+/* $XConsortium: InitInput.c,v 1.7 94/09/16 01:31:57 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/hw/vfb/InitOutput.c b/xc/programs/Xserver/hw/vfb/InitOutput.c
index b73f501d4..88aacbc44 100644
--- a/xc/programs/Xserver/hw/vfb/InitOutput.c
+++ b/xc/programs/Xserver/hw/vfb/InitOutput.c
@@ -1,4 +1,4 @@
-/* $XConsortium: InitOutput.c,v 1.13 94/08/02 15:43:46 dpw Exp ray $ */
+/* $XConsortium: InitOutput.c,v 1.14 94/12/05 17:55:50 ray Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/hw/vfb/Xvfb.man b/xc/programs/Xserver/hw/vfb/Xvfb.man
index 645a80939..9b1c1d4cc 100644
--- a/xc/programs/Xserver/hw/vfb/Xvfb.man
+++ b/xc/programs/Xserver/hw/vfb/Xvfb.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: Xvfb.man,v 1.6 94/04/17 20:30:25 dpw Exp dpw $
+.\" $XConsortium: Xvfb.man,v 1.7 94/08/02 15:41:36 dpw Exp $
.\" Copyright (c) 1993 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/Xserver/hw/vfb/lk201kbd.h b/xc/programs/Xserver/hw/vfb/lk201kbd.h
index 2fa266506..cd8aee66b 100644
--- a/xc/programs/Xserver/hw/vfb/lk201kbd.h
+++ b/xc/programs/Xserver/hw/vfb/lk201kbd.h
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: lk201kbd.h,v 1.1 93/12/02 17:29:28 dpw Exp $ */
+/* $XConsortium: lk201kbd.h,v 1.2 94/04/17 20:30:26 dpw Exp $ */
#define MIN_LK201_KEY 86
#define MAX_LK201_KEY 251
diff --git a/xc/programs/Xserver/hw/xfree86/Imakefile b/xc/programs/Xserver/hw/xfree86/Imakefile
index d0c7f401c..75e8224a9 100644
--- a/xc/programs/Xserver/hw/xfree86/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 94/12/01 16:49:58 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.4 95/01/05 20:53:30 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/Imakefile,v 3.16 1994/11/30 20:35:44 dawes Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/xfree86/SuperProbe/I128.c b/xc/programs/Xserver/hw/xfree86/SuperProbe/I128.c
index 896020ae2..3472860c1 100644
--- a/xc/programs/Xserver/hw/xfree86/SuperProbe/I128.c
+++ b/xc/programs/Xserver/hw/xfree86/SuperProbe/I128.c
@@ -25,7 +25,7 @@
*
*/
-/* $XConsortium: $ */
+/* $XConsortium: I128.c,v 1.3 95/06/19 20:04:38 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/I128.c,v 3.2 1994/12/25 12:18:05 dawes Exp $ */
#include "Probe.h"
diff --git a/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c b/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c
index 6f637c01e..e55f4f2dc 100644
--- a/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c
+++ b/xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c
@@ -26,7 +26,7 @@
*
*/
-/* $XConsortium: $ */
+/* $XConsortium: OS_Os2.c,v 1.1 95/01/06 20:47:15 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/OS_Os2.c,v 3.0 1994/12/17 09:58:09 dawes Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/XF86_Acc.man b/xc/programs/Xserver/hw/xfree86/XF86_Acc.man
index 5e40b4ae2..d6c1c2505 100644
--- a/xc/programs/Xserver/hw/xfree86/XF86_Acc.man
+++ b/xc/programs/Xserver/hw/xfree86/XF86_Acc.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: XF86_Acc.man,v 1.7 95/01/16 13:16:11 kaleb Exp kaleb $
+.\" $XConsortium: XF86_Acc.man,v 1.8 95/01/23 15:33:27 kaleb Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_Acc.man,v 3.24 1995/01/22 03:04:16 dawes Exp $
.TH XF86_Accel 1 "Version 3.1.1" "XFree86"
.SH NAME
diff --git a/xc/programs/Xserver/hw/xfree86/XF86_Mono.man b/xc/programs/Xserver/hw/xfree86/XF86_Mono.man
index 8f8cf8f06..5fe3218a7 100644
--- a/xc/programs/Xserver/hw/xfree86/XF86_Mono.man
+++ b/xc/programs/Xserver/hw/xfree86/XF86_Mono.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: XF86_Mono.man,v 1.5 95/01/16 13:16:12 kaleb Exp kaleb $
+.\" $XConsortium: XF86_Mono.man,v 1.6 95/01/23 15:33:29 kaleb Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_Mono.man,v 3.7 1995/01/21 07:14:23 dawes Exp $
.TH XF86_Mono 1 "Version 3.1.1" "XFree86"
.SH NAME
diff --git a/xc/programs/Xserver/hw/xfree86/XF86_SVGA.man b/xc/programs/Xserver/hw/xfree86/XF86_SVGA.man
index db38186e0..b36832efd 100644
--- a/xc/programs/Xserver/hw/xfree86/XF86_SVGA.man
+++ b/xc/programs/Xserver/hw/xfree86/XF86_SVGA.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: XF86_SVGA.man,v 1.5 95/01/16 13:16:13 kaleb Exp kaleb $
+.\" $XConsortium: XF86_SVGA.man,v 1.6 95/01/23 15:33:29 kaleb Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_SVGA.man,v 3.16 1995/01/21 07:14:25 dawes Exp $
.TH XF86_SVGA 1 "Version 3.1.1" "XFree86"
.SH NAME
diff --git a/xc/programs/Xserver/hw/xfree86/XF86_VGA16.man b/xc/programs/Xserver/hw/xfree86/XF86_VGA16.man
index 221a1b6a8..ddeb5013a 100644
--- a/xc/programs/Xserver/hw/xfree86/XF86_VGA16.man
+++ b/xc/programs/Xserver/hw/xfree86/XF86_VGA16.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: XF86_VGA16.man,v 1.4 95/01/16 13:16:14 kaleb Exp kaleb $
+.\" $XConsortium: XF86_VGA16.man,v 1.5 95/01/23 15:33:31 kaleb Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/XF86_VGA16.man,v 3.7 1995/01/21 07:14:26 dawes Exp $
.TH XF86_VGA16 1 "Version 3.1.1" "XFree86"
.SH NAME
diff --git a/xc/programs/Xserver/hw/xfree86/XFree86.man b/xc/programs/Xserver/hw/xfree86/XFree86.man
index 7aa3bf55a..1925b4c3b 100644
--- a/xc/programs/Xserver/hw/xfree86/XFree86.man
+++ b/xc/programs/Xserver/hw/xfree86/XFree86.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: XFree86.man,v 1.5 95/01/16 13:16:14 kaleb Exp kaleb $
+.\" $XConsortium: XFree86.man,v 1.6 95/01/23 15:33:32 kaleb Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/XFree86.man,v 3.8 1995/01/21 07:14:27 dawes Exp $
.TH XFree86 1 "Version 3.1.1" "XFree86"
.SH NAME
diff --git a/xc/programs/Xserver/hw/xfree86/accel/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/Imakefile
index beefd51c7..2afd1b87a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:01:57 dpw Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c
index 2676531fc..c8e3b0157 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: Bt481.c,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.c,v 3.2 1995/01/26 02:16:43 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h
index 0500e94c0..f9dfebc97 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: Bt481.h,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt481.h,v 3.0 1994/06/15 15:35:50 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c
index 21a7cf07e..a4c7aaee0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: Bt485.c,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.c,v 3.2 1995/01/26 02:16:46 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h
index ed0ac3daa..e9ba78c2f 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: Bt485.h,v 1.1 95/01/26 15:31:41 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/Bt485.h,v 3.1 1994/09/07 15:47:44 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c b/xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c
index 95bca095f..cc13a7b06 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c
@@ -1,4 +1,4 @@
-/* $XConsortium: agxDLine.c,v 1.1 94/12/27 10:49:51 kaleb Exp kaleb $ */
+/* $XConsortium: agxDLine.c,v 1.2 95/01/06 20:56:48 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxDLine.c,v 3.1 1994/12/25 12:19:12 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c b/xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c
index 71b3cd775..c5a648801 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: agxDSeg.c,v 1.1 94/12/27 10:50:35 kaleb Exp kaleb $ */
+/* $XConsortium: agxDSeg.c,v 1.2 95/01/06 20:56:49 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxDSeg.c,v 3.1 1994/12/25 12:19:14 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c b/xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c
index f71518131..13b535a05 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c
@@ -27,7 +27,7 @@ Author: Bob Scheifler, MIT X Consortium
********************************************************/
-/* $XConsortium: agxFArc.c,v 1.1 94/12/27 10:50:55 kaleb Exp kaleb $ */
+/* $XConsortium: agxFArc.c,v 1.2 95/01/12 19:38:51 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFArc.c,v 3.1 1994/11/22 02:37:19 dawes Exp $ */
#include <math.h>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c b/xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c
index 634305d22..0a671beb8 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: agxFPoly.c,v 1.1 94/12/27 10:51:08 kaleb Exp kaleb $ */
+/* $XConsortium: agxFPoly.c,v 1.2 95/01/12 19:39:46 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/agx/agxFPoly.c,v 3.0 1994/11/19 07:50:04 dawes Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/cache/Imakefile
index ce4bb5dd4..490a88230 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:02:03 dpw Exp $
#include <Server.tmpl>
SRCS = xf86bcache.c xf86fcache.c xf86text.c
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c
index 7a5588b23..f7a49ecf0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86bcache.c,v 1.1 94/10/05 13:27:54 kaleb Exp $ */
+/* $XConsortium: xf86bcache.c,v 1.2 94/10/12 19:48:30 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.c,v 3.1 1994/07/15 06:57:38 dawes Exp $ */
/*
* Based on the S3 block allocator code in XFree86-2.0 by Jon Tombs.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.h b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.h
index 3caba9a52..0268361f2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86bcache.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: xf86bcache.h,v 1.1 94/03/28 21:02:16 dpw Exp $ */
/*
* Structures, typedefs and function prototypes.
*/
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c
index 13c6f77da..b0cc4582c 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86fcache.c,v 1.3 94/11/01 10:26:20 kaleb Exp kaleb $ */
+/* $XConsortium: xf86fcache.c,v 1.4 95/01/05 20:25:04 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.c,v 3.5 1994/11/26 12:40:20 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h
index 39f616ba8..6c62f1f56 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86fcache.h,v 1.3 94/11/01 10:26:43 kaleb Exp kaleb $ */
+/* $XConsortium: xf86fcache.h,v 1.4 95/01/05 20:25:04 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86fcache.h,v 3.3 1994/11/26 12:40:21 dawes Exp $ */
/*
* Data structures and function prototypes for the font cache.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.c b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.c
index 1bcc771a0..82ecb8d10 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: xf86text.c,v 1.1 94/03/28 21:02:35 dpw Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h
index f15064969..aa9e46b08 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86text.h,v 1.1 94/10/05 13:27:54 kaleb Exp $ */
+/* $XConsortium: xf86text.h,v 1.2 94/10/12 19:48:30 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/cache/xf86text.h,v 3.0 1994/08/01 12:09:19 dawes Exp $ */
/*
* Function prototypes for the text output functions.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32line.s b/xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32line.s
index 78e10be65..99a025fb0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32line.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32line.s
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: w32line.s,v 1.2 95/06/19 17:45:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/et4000w32/asm/w32line.s,v 3.0 1994/11/19 08:06:55 dawes Exp $ */
/*******************************************************************************
Copyright 1994 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c b/xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c
index 401370f61..6d946c079 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/et4000w32/cfb.w32/w32polypnt.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: w32polypnt.c,v 1.1 94/12/27 10:52:22 kaleb Exp kaleb $ */
+/* $XConsortium: w32polypnt.c,v 1.2 95/01/12 20:04:59 kaleb Exp $ */
#include "X.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h
index aef55c44d..7f4589689 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514cach.h,v 1.1 94/03/28 21:03:26 dpw Exp $ */
+/* $XConsortium: 8514cach.h,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514cach.h,v 3.1 1994/09/07 15:48:24 dawes Exp $ */
void ibm8514GlyphWrite(
#if NeedFunctionPrototypes
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514im.h b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514im.h
index b1e139bba..10c5fd9f1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514im.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/8514im.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514im.h,v 1.1 94/03/28 21:04:48 dpw Exp $ */
+/* $XConsortium: 8514im.h,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile
index df05df1b6..e5d8b74d1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 19:52:10 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/26 15:34:40 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/Imakefile,v 3.1 1995/01/26 02:17:17 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bcach.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bcach.c
index e3718fee7..c8dae2109 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514bc.c,v 1.1 94/03/28 21:03:08 dpw Exp $ */
+/* $XConsortium: bcach.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
* Copyright 1993 by Jon Tombs. Oxford University
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c
index 3ac778e69..6b48027dc 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: blt.c,v 1.1 95/01/26 15:29:18 kaleb Exp kaleb $ */
+/* $XConsortium: blt.c,v 1.2 95/06/19 15:58:20 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/blt.c,v 3.0 1994/06/06 06:44:14 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bstor.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bstor.c
index 08938112e..420095e19 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bstor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/bstor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514bsto.c,v 1.1 94/03/28 21:03:20 dpw Exp $ */
+/* $XConsortium: bstor.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*-
* ibm8514bstore.c --
* Functions required by the backing-store implementation in MI.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/cmap.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/cmap.c
index d982a1e7b..24670b48d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/cmap.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/cmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514cmap.c,v 1.1 94/03/28 21:03:32 dpw Exp $ */
+/* $XConsortium: cmap.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsline.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsline.c
index 0d3f8be04..10f08faa9 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsline.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsline.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514dsln.c,v 1.2 94/04/17 20:30:30 dpw Exp $ */
+/* $XConsortium: dsline.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsseg.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsseg.c
index b265468c1..4909c1aae 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsseg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/dsseg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514dssg.c,v 1.2 94/04/17 20:30:31 dpw Exp $ */
+/* $XConsortium: dsseg.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c
index 65b55eb16..ac20287c1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514fc.c,v 1.1 94/03/28 21:03:51 dpw Exp $ */
+/* $XConsortium: fc.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fc.c,v 3.1 1994/08/01 12:09:37 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c
index 9fd81b19d..d713ee64f 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514fcac.c,v 1.1 94/03/28 21:03:58 dpw Exp $ */
+/* $XConsortium: fcach.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fcach.c,v 3.3 1995/01/26 02:17:18 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/font.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/font.c
index 71a1fc833..b6525cd3f 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/font.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/font.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514font.c,v 1.1 94/03/28 21:04:04 dpw Exp $ */
+/* $XConsortium: font.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c
index e496fb493..d7c825482 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: frect.c,v 1.1 95/01/26 15:29:18 kaleb Exp kaleb $ */
+/* $XConsortium: frect.c,v 1.2 95/06/19 15:58:20 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/frect.c,v 3.1 1994/11/26 12:40:53 dawes Exp $ */
/*
* Fill rectangles.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c
index 12b4c3572..707138703 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514fs.c,v 1.2 94/04/17 20:30:33 dpw Exp $ */
+/* $XConsortium: fs.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/fs.c,v 3.1 1994/08/01 12:09:38 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c
index 420f6c953..d254dbd69 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514gc.c,v 1.2 94/04/17 20:30:33 dpw Exp $ */
+/* $XConsortium: gc.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/gc.c,v 3.1 1994/09/07 15:48:26 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gs.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gs.c
index f1e13b31f..8a5d48022 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514gs.c,v 1.2 94/04/17 20:30:34 dpw Exp $ */
+/* $XConsortium: gs.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c
index 6f595e4f4..2aafea667 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514gtim.c,v 1.1 94/03/28 21:04:35 dpw Exp $ */
+/* $XConsortium: gtimg.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/gtimg.c,v 3.0 1994/07/24 11:43:19 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c
index b71ef6644..8a2c5b415 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514.c,v 1.5 95/01/16 13:16:28 kaleb Exp kaleb $ */
+/* $XConsortium: ibm8514.c,v 1.6 95/01/26 15:34:40 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.c,v 3.12 1995/01/26 02:17:19 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h
index e95a576ef..66409a8b1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514.h,v 1.5 95/01/05 20:25:39 kaleb Exp kaleb $ */
+/* $XConsortium: ibm8514.h,v 1.6 95/01/16 13:16:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/ibm8514.h,v 3.4 1995/01/15 10:30:33 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c
index 95da1d29b..9f3eecf0d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514im.c,v 1.1 94/03/28 21:04:41 dpw Exp $ */
+/* $XConsortium: im.c,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/im.c,v 3.4 1995/01/26 02:17:26 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imfill.s b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imfill.s
index 5a0ef505e..7943660fc 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imfill.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imfill.s
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514imfl.s,v 1.2 94/03/29 09:37:34 dpw Exp $ */
+/* $XConsortium: imfill.s,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
/******************************************************************************
This is a assembly language version of the ibm8514ImageFill routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imread.s b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imread.s
index 87abeb4f2..f8f5ee848 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imread.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imread.s
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514imrd.s,v 1.2 94/03/29 09:37:41 dpw Exp $ */
+/* $XConsortium: imread.s,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
/******************************************************************************
This is a assembly language version of the ibm8514ImageRead routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imstip.s b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imstip.s
index 482540cbc..0a926f377 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imstip.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imstip.s
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514imst.s,v 1.2 94/03/29 09:37:45 dpw Exp $ */
+/* $XConsortium: imstip.s,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
/******************************************************************************
This is a assembly language version of the ibm8514ImageStipple routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imwrite.s b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imwrite.s
index db025f409..741296e44 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imwrite.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/imwrite.s
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514imwr.s,v 1.2 94/03/29 09:37:47 dpw Exp $ */
+/* $XConsortium: imwrite.s,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
/******************************************************************************
This is a assembly language version of the ibm8514ImageWrite routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c
index edf659880..6a68acdf7 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514init.c,v 1.1 94/03/28 21:05:21 dpw Exp $ */
+/* $XConsortium: init.c,v 1.1 95/01/26 15:30:17 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/init.c,v 3.1 1994/08/01 13:18:07 dawes Exp $ */
/*
* Written by Jake Richter
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c
index d651ce7d4..42a10acb5 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514line.c,v 1.2 94/04/17 20:30:35 dpw Exp $ */
+/* $XConsortium: line.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/line.c,v 3.0 1994/06/06 06:44:16 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/plypt.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/plypt.c
index 7bd272f80..3712e0a65 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/plypt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/plypt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: plypt.c,v 1.1 95/01/26 15:29:18 kaleb Exp kaleb $ */
+/* $XConsortium: plypt.c,v 1.2 95/06/19 15:58:20 kaleb Exp $ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/reg8514.h b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/reg8514.h
index 65e64273c..e303f236d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/reg8514.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/reg8514.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: reg8514.h,v 1.1 94/03/28 21:06:17 dpw Exp $ */
/* REG8514.H
*
* Written by Jake Richter
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c
index d62e9669c..a8211495e 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: scrin.c,v 1.1 95/01/26 15:29:18 kaleb Exp kaleb $ */
+/* $XConsortium: scrin.c,v 1.2 95/06/19 15:58:20 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/scrin.c,v 3.1 1994/12/10 03:00:01 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/seg.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/seg.c
index 260a05b2c..337f18e8c 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/seg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/seg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514seg.c,v 1.2 94/04/17 20:30:37 dpw Exp $ */
+/* $XConsortium: seg.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ss.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ss.c
index 81dbcf75f..e2a7111a6 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ss.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/ss.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514ss.c,v 1.2 94/04/17 20:30:39 dpw Exp $ */
+/* $XConsortium: ss.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/text.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/text.c
index 12db422d8..3ff3cb932 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/text.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/text.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514text.c,v 1.1 94/03/28 21:06:05 dpw Exp $ */
+/* $XConsortium: text.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c
index 75eb75dce..cafe547b4 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ibm8514win.c,v 1.2 94/04/17 20:30:40 dpw Exp $ */
+/* $XConsortium: win.c,v 1.1 95/01/26 15:29:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/ibm8514/win.c,v 3.1 1994/09/07 16:19:12 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile
index 7bc25e97c..2c4ffd915 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 19:59:09 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:57:00 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/Imakefile,v 3.6 1994/12/17 10:05:00 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c
index 0beb197b8..41c4c4e7e 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ativga.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: ativga.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.c,v 3.0 1994/05/08 06:21:25 dawes Exp $ */
/***************************************************************************
* Start of VGA font saving and restoration code.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.h b/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.h
index 6ed4c4e80..150d5545a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/ativga.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ativga.h,v 1.1 94/03/28 21:06:36 dpw Exp $ */
/***************************************************************************
* Start of VGA font saving and restoration code.
* Created: Sun Jun 27 12:50:09 1993 by faith@cs.unc.edu
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c
index ba2b5213c..3c025e029 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32.c,v 1.4 95/01/06 20:57:01 kaleb Exp kaleb $ */
+/* $XConsortium: mach32.c,v 1.5 95/01/16 13:16:29 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.c,v 3.28 1995/01/15 10:30:52 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h
index 33f7ea01e..605421b10 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32.h,v 1.4 95/01/05 20:27:25 kaleb Exp kaleb $ */
+/* $XConsortium: mach32.h,v 1.5 95/01/16 13:16:30 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32.h,v 3.9 1995/01/15 10:30:54 dawes Exp $ */
/*
* Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c
index 47c3f522d..be0a04a18 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32blt.c,v 1.4 94/10/14 17:24:16 kaleb Exp kaleb $ */
+/* $XConsortium: mach32blt.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32blt.c,v 3.5 1994/11/26 12:41:41 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c
index 892b8381f..e0b87af89 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32bstor.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32bstor.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32bstor.c,v 3.1 1994/07/15 06:58:05 dawes Exp $ */
/*-
* mach32bstore.c --
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c
index f1197ce1e..924a503a2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32cmap.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32cmap.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32cmap.c,v 3.0 1994/09/11 00:48:46 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c
index 6e23ec719..dd163ab84 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: mach32curs.c,v 1.1 94/10/05 13:31:19 kaleb Exp $
+ * $XConsortium: mach32curs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32curs.c,v 3.1 1994/09/11 00:48:48 dawes Exp $
*
* Copyright 1991 MIPS Computer Systems, Inc.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c
index 1ae600ca9..c9a98f10a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32dline.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32dline.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dline.c,v 3.3 1994/09/11 00:48:51 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c
index 547eb1f95..566a4a6f3 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32dseg.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32dseg.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32dseg.c,v 3.4 1994/09/11 00:48:52 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c
index fee67b687..2e1187dbd 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32fcach.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32fcach.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fcach.c,v 3.6 1994/09/11 00:48:53 dawes Exp $ */
/*
* Copyright 1992, 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c
index 08407b015..96fec2d3b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32font.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32font.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32font.c,v 3.1 1994/08/31 06:19:43 dawes Exp $ */
/*
* Copyright 1992, 1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c
index a7e2141c0..e424b52ea 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32frect.c,v 1.4 94/10/14 13:11:59 kaleb Exp kaleb $ */
+/* $XConsortium: mach32frect.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32frect.c,v 3.6 1994/11/26 12:41:43 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c
index 7a6aed39f..f41ed1aa0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32fs.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32fs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32fs.c,v 3.5 1994/09/11 00:48:56 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c
index f1ed856f9..e5e8c1985 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32gc.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32gc.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gc.c,v 3.4 1994/09/11 00:48:58 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c
index 2868ebc40..09b16dde2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32gs.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32gs.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gs.c,v 3.1 1994/07/15 06:58:14 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c
index 4c21d7257..3f03cd7f0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32gtimg.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32gtimg.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32gtimg.c,v 3.2 1994/07/24 11:43:32 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c
index 88e9aa76b..eba34affe 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32im.c,v 1.4 94/10/14 17:24:16 kaleb Exp kaleb $ */
+/* $XConsortium: mach32im.c,v 1.5 95/01/05 20:27:25 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.c,v 3.5 1994/11/26 12:41:45 dawes Exp $ */
/*
* Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.h b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.h
index c12c575e5..94380bde0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32im.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach32im.h,v 1.1 94/03/28 21:08:28 dpw Exp $ */
/*
* Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c
index 8f2b9d675..589a9c55b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32init.c,v 1.3 95/01/05 20:27:25 kaleb Exp kaleb $ */
+/* $XConsortium: mach32init.c,v 1.4 95/01/06 20:57:03 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32init.c,v 3.6 1994/12/25 12:23:21 dawes Exp $ */
/*
* Written by Jake Richter
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c
index 2ae6c0126..c6283ee16 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32line.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32line.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32line.c,v 3.1 1994/09/11 00:49:03 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c
index ec0cedbc9..e55ab4fbf 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32mem.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32mem.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32mem.c,v 3.1 1994/09/07 16:19:52 dawes Exp $ */
/*
* Copyright 1993 ATI
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c
index f2194f476..97d230596 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32plypt.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32plypt.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32plypt.c,v 3.2 1994/09/11 00:49:04 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c
index 95382a515..ddb712b5a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32pntwn.c,v 1.3 94/10/12 19:59:09 kaleb Exp kaleb $ */
+/* $XConsortium: mach32pntwn.c,v 1.4 95/01/23 15:33:49 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32pntwn.c,v 3.4 1995/01/20 05:45:44 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c
index e74fdacdd..f1153c756 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32scrin.c,v 1.3 94/10/12 19:59:09 kaleb Exp kaleb $ */
+/* $XConsortium: mach32scrin.c,v 1.4 95/01/06 20:57:04 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32scrin.c,v 3.5 1994/12/10 02:07:52 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c
index 6d9dfb9c6..475326a49 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32seg.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32seg.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32seg.c,v 3.1 1994/09/11 00:49:07 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c
index b51115138..430522dfb 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32ss.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32ss.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32ss.c,v 3.1 1994/07/15 06:58:19 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c
index 576f8553a..c72e1c951 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32text.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32text.c,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32text.c,v 3.5 1994/09/11 00:49:09 dawes Exp $ */
/*
* Copyright 1992,1993 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c
index dedb28ce0..829382125 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach32win.c,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: mach32win.c,v 1.3 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/mach32win.c,v 3.3 1994/09/11 00:49:10 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h b/xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h
index acb7b6d3f..96ad689a4 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h
@@ -1,4 +1,4 @@
-/* $XConsortium: regmach32.h,v 1.1 94/10/05 13:31:19 kaleb Exp $ */
+/* $XConsortium: regmach32.h,v 1.2 94/10/12 19:59:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach32/regmach32.h,v 3.2 1994/06/01 03:18:22 dawes Exp $ */
/* regmach32.h
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile
index dbddb364e..f1691bcef 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.1 94/12/14 15:04:34 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/Imakefile,v 3.1 1994/11/27 07:04:42 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c
index aaf96e7ea..d346d6390 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: ativga.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.c,v 3.0 1994/11/26 12:42:34 dawes Exp $ */
/***************************************************************************
* Start of VGA font saving and restoration code.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h b/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h
index 6b7a93ead..d042c07bb 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: ativga.h,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/ativga.h,v 3.0 1994/11/26 12:42:35 dawes Exp $ */
/***************************************************************************
* Start of VGA font saving and restoration code.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c
index 4f28098f1..6d9dc27da 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach64.c,v 1.3 95/01/16 13:16:31 kaleb Exp kaleb $ */
+/* $XConsortium: mach64.c,v 1.4 95/01/23 15:33:50 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.c,v 3.6 1995/01/21 07:15:01 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h
index 494aebeb6..a3f804e5b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mach64.h,v 1.1 94/12/14 15:04:34 kaleb Exp kaleb $ */
+/* $XConsortium: mach64.h,v 1.2 95/01/16 13:16:32 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64.h,v 3.4 1995/01/15 10:31:09 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c
index 490d51a9f..4455e95e2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64blt.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64blt.c,v 3.1 1994/12/05 03:45:40 dawes Exp $ */
/*
* Copyright 1989 by the Massachusetts Institute of Technology
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c
index f0387265c..87ae12efb 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64bstor.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64bstor.c,v 3.0 1994/11/26 12:42:41 dawes Exp $ */
/*-
* mach64bstore.c --
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c
index 51237eaba..ef8451b57 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64cmap.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64cmap.c,v 3.0 1994/11/26 12:42:42 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c
index f0ac9cc3d..0f553e115 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach64curs.c,v 1.1 94/12/14 15:04:34 kaleb Exp kaleb $ */
+/* $XConsortium: mach64curs.c,v 1.2 95/01/12 20:21:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64curs.c,v 3.0 1994/11/26 12:42:43 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c
index 0faab0c33..fcac523ed 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64fcach.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fcach.c,v 3.0 1994/11/26 12:42:44 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c
index 6eb3cfdfa..ae5f67921 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64font.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64font.c,v 3.0 1994/11/26 12:42:45 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c
index 5c0cb2c85..20c0b655c 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64frect.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64frect.c,v 3.1 1994/11/27 07:04:47 dawes Exp $ */
/*
* Copyright 1989 by the Massachusetts Institute of Technology
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c
index 3f434d58c..984b289df 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64fs.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64fs.c,v 3.0 1994/11/26 12:42:48 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c
index 725273fe5..b4bfbe7b1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64gc.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64gc.c,v 3.1 1994/12/05 03:45:42 dawes Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c
index 1180dc12e..3a4eebf73 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64im.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.c,v 3.1 1994/12/05 03:45:44 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h
index 654857698..ed45e2a7c 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64im.h,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64im.h,v 3.2 1994/12/05 03:45:45 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c
index 6eac68752..295e40cd8 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach64init.c,v 1.2 95/01/06 20:57:06 kaleb Exp kaleb $ */
+/* $XConsortium: mach64init.c,v 1.3 95/01/16 13:16:33 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64init.c,v 3.2 1995/01/15 10:31:10 dawes Exp $ */
/*
* Written by Jake Richter
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c
index d7b1534c3..22bf30cd2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64line.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64line.c,v 3.0 1994/11/26 12:42:54 dawes Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c
index f1a03a7e9..6130a8e12 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach64orect.c,v 1.1 94/12/14 15:04:34 kaleb Exp kaleb $ */
+/* $XConsortium: mach64orect.c,v 1.2 95/01/16 13:16:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64orect.c,v 3.1 1995/01/15 10:31:12 dawes Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c
index 834904b7d..2efd7fcc0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach64pcach.c,v 1.1 94/12/14 15:04:34 kaleb Exp kaleb $ */
+/* $XConsortium: mach64pcach.c,v 1.2 95/01/16 13:16:35 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pcach.c,v 3.3 1995/01/15 10:31:13 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c
index 903984fcd..d6e337203 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64pntwn.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64pntwn.c,v 3.0 1994/11/26 12:42:58 dawes Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c
index effd31d0d..ac8fd5da6 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64scrin.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64scrin.c,v 3.0 1994/11/26 12:42:59 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c
index 76f1f077f..df685a974 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64seg.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64seg.c,v 3.0 1994/11/26 12:43:00 dawes Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c
index 6af2eb09b..def199673 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64text.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64text.c,v 3.1 1994/12/05 03:45:48 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
index e860377bd..d2ed74131 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64util.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64util.c,v 3.0 1994/11/26 12:43:02 dawes Exp $ */
/*
* Copyright 1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c
index ddd5c5fa4..d8d5836a6 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: mach64win.c,v 1.1 94/12/14 15:04:34 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/mach64win.c,v 3.0 1994/11/26 12:43:03 dawes Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h b/xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h
index d848c561b..cae850f74 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h
@@ -1,4 +1,4 @@
-/* $XConsortium: regmach64.h,v 1.1 94/12/14 15:04:34 kaleb Exp kaleb $ */
+/* $XConsortium: regmach64.h,v 1.2 95/01/16 13:16:36 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach64/regmach64.h,v 3.1 1995/01/15 10:31:15 dawes Exp $ */
/*
* Copyright 1992,1993,1994 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile
index da2216d17..710a41713 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:31:46 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:01:59 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/Imakefile,v 3.1 1994/08/01 12:11:42 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c
index 717a56b36..e5b8a9062 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.6 95/01/06 20:57:07 kaleb Exp kaleb $ */
+/* $XConsortium: mach8.c,v 1.7 95/01/16 13:16:36 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.c,v 3.15 1995/01/15 10:31:37 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h
index 71ab9cc5f..98cbfd67a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.h,v 1.5 95/01/05 20:28:29 kaleb Exp kaleb $ */
+/* $XConsortium: mach8.h,v 1.6 95/01/16 13:16:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8.h,v 3.4 1995/01/15 10:31:38 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bc.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bc.c
index aa17635fe..1fad7162d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bc.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach8bc.c,v 1.1 94/03/28 21:10:09 dpw Exp $ */
/*
* Copyright 1993 by Jon Tombs. Oxford University
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c
index 979716e8a..f441c20f8 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8blt.c,v 1.5 95/01/05 20:28:29 kaleb Exp kaleb $ */
+/* $XConsortium: mach8blt.c,v 1.6 95/01/12 20:20:29 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8blt.c,v 3.2 1994/11/26 12:43:25 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bstor.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bstor.c
index 0fc92e91f..62d9d50ee 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bstor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8bstor.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach8bstor.c,v 1.1 94/03/28 21:10:21 dpw Exp $ */
/*-
* mach8bstore.c --
* Functions required by the backing-store implementation in MI.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h
index ced17c490..cf128c74b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8cache.h,v 1.1 94/10/05 13:31:46 kaleb Exp $ */
+/* $XConsortium: mach8cache.h,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cache.h,v 3.2 1994/09/07 15:50:07 dawes Exp $ */
void mach8GlyphWrite(
#if NeedFunctionPrototypes
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cmap.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cmap.c
index 0cea09cd6..97ce2bc6a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cmap.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8cmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach8cmap.c,v 1.1 94/03/28 21:10:33 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dsln.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dsln.c
index ff6c44e96..a017ad719 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dsln.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dsln.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8dsln.c,v 1.1 94/03/28 21:10:39 dpw Exp $ */
+/* $XConsortium: mach8dsln.c,v 1.2 94/04/17 20:30:54 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dssg.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dssg.c
index 8e41fc536..b1afa6294 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dssg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8dssg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8dssg.c,v 1.1 94/03/28 21:10:46 dpw Exp $ */
+/* $XConsortium: mach8dssg.c,v 1.2 94/04/17 20:30:55 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c
index 79f9135dd..563b80d70 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8fc.c,v 1.1 94/10/05 13:31:46 kaleb Exp $ */
+/* $XConsortium: mach8fc.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fc.c,v 3.1 1994/08/01 12:11:12 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c
index 89edf2859..4d4629c06 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8fcach.c,v 1.1 94/10/05 13:31:46 kaleb Exp $ */
+/* $XConsortium: mach8fcach.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fcach.c,v 3.2 1994/09/07 15:50:08 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8font.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8font.c
index a60f6aff5..59cd91e91 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8font.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8font.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach8font.c,v 1.1 94/03/28 21:11:04 dpw Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c
index 2eebd685d..fc67e1167 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8frect.c,v 1.5 95/01/05 22:40:06 kaleb Exp kaleb $ */
+/* $XConsortium: mach8frect.c,v 1.6 95/01/12 20:19:35 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8frect.c,v 3.1 1994/11/26 12:43:26 dawes Exp $ */
/*
* Fill rectangles.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c
index d93c119ce..9c4715fbd 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8fs.c,v 1.3 94/10/12 20:01:59 kaleb Exp kaleb $ */
+/* $XConsortium: mach8fs.c,v 1.4 95/01/05 20:28:29 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8fs.c,v 3.1 1994/11/26 12:43:28 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c
index dd471e192..a63243ae3 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8gc.c,v 1.2 94/04/17 20:30:57 dpw Exp kaleb $ */
+/* $XConsortium: mach8gc.c,v 1.3 95/01/05 22:39:54 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gc.c,v 3.0 1994/11/26 12:43:30 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gs.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gs.c
index 7157d1e68..2b9d6f1eb 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8gs.c,v 1.1 94/03/28 21:11:29 dpw Exp $ */
+/* $XConsortium: mach8gs.c,v 1.2 94/04/17 20:30:58 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c
index 174afe8bd..87dd311dd 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8gtimg.c,v 1.1 94/10/05 13:31:46 kaleb Exp $ */
+/* $XConsortium: mach8gtimg.c,v 1.2 94/10/12 20:01:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8gtimg.c,v 3.0 1994/07/24 11:46:17 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c
index 5f9683aa0..59b8be839 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8im.c,v 1.5 95/01/05 20:28:29 kaleb Exp kaleb $ */
+/* $XConsortium: mach8im.c,v 1.6 95/01/06 20:57:08 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.c,v 3.4 1994/12/10 02:08:11 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.h b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.h
index 2b6b31619..71705f560 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8im.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach8im.h,v 1.1 94/03/28 21:11:47 dpw Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imfl.s b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imfl.s
index a3e96bae2..6dcdcee66 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imfl.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imfl.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: mach8imfl.s,v 1.2 94/03/29 09:50:58 dpw Exp $ */
/******************************************************************************
This is a assembly language version of the mach8ImageFill routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imrd.s b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imrd.s
index 5fd4e10e5..a4533ab2b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imrd.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imrd.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: mach8imrd.s,v 1.2 94/03/29 09:51:12 dpw Exp $ */
/******************************************************************************
This is a assembly language version of the mach8ImageRead routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imst.s b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imst.s
index b9bb2e333..31a00160d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imst.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imst.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: mach8imst.s,v 1.2 94/03/29 09:51:16 dpw Exp $ */
/******************************************************************************
This is a assembly language version of the mach8ImageStipple routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imwrt.s b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imwrt.s
index ea9fc912b..0b96d01c4 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imwrt.s
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8imwrt.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: mach8imwrt.s,v 1.2 94/03/29 09:51:20 dpw Exp $ */
/******************************************************************************
This is a assembly language version of the mach8ImageWrite routine.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c
index 90b5c476e..5bd33a470 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8init.c,v 1.2 94/10/12 20:01:59 kaleb Exp kaleb $ */
+/* $XConsortium: mach8init.c,v 1.3 95/01/06 20:57:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8init.c,v 3.2 1994/12/11 10:52:47 dawes Exp $ */
/*
* Written by Jake Richter
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8line.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8line.c
index 5a30b10ba..5a1ef4fe6 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8line.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8line.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8line.c,v 1.1 94/03/28 21:12:23 dpw Exp $ */
+/* $XConsortium: mach8line.c,v 1.2 94/04/17 20:30:59 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8plypt.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8plypt.c
index 07c20f713..275bdf6e9 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8plypt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8plypt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8plypt.c,v 1.2 94/04/17 20:31:00 dpw Exp kaleb $ */
+/* $XConsortium: mach8plypt.c,v 1.3 95/06/19 16:14:01 kaleb Exp $ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c
index af7677a92..46cd08387 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8scrin.c,v 1.3 95/01/06 20:57:10 kaleb Exp kaleb $ */
+/* $XConsortium: mach8scrin.c,v 1.4 95/01/16 20:07:03 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8scrin.c,v 3.1 1994/12/10 03:00:30 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c
index ad88a03b4..e012c1925 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8seg.c,v 1.1 94/10/05 13:31:46 kaleb Exp $ */
+/* $XConsortium: mach8seg.c,v 1.3 94/10/12 20:01:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8seg.c,v 3.0 1994/06/06 06:46:45 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8ss.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8ss.c
index d3519dfb9..ca8cade1b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8ss.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8ss.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8ss.c,v 1.1 94/03/28 21:12:54 dpw Exp $ */
+/* $XConsortium: mach8ss.c,v 1.2 94/04/17 20:31:02 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c
index 37c751596..85e7e0a59 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8text.c,v 1.2 94/10/14 13:25:08 kaleb Exp kaleb $ */
+/* $XConsortium: mach8text.c,v 1.3 95/01/05 20:28:29 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8text.c,v 3.1 1994/11/27 08:22:05 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c
index 8d6cbc7e3..fef991e89 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8win.c,v 1.1 94/10/05 13:31:46 kaleb Exp $ */
+/* $XConsortium: mach8win.c,v 1.3 94/10/12 20:01:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/mach8/mach8win.c,v 3.0 1994/05/31 08:04:46 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/mach8/regmach8.h b/xc/programs/Xserver/hw/xfree86/accel/mach8/regmach8.h
index 50ccfd050..4ddd6d6d8 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/mach8/regmach8.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/mach8/regmach8.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: regmach8.h,v 1.1 94/03/28 21:13:12 dpw Exp $ */
/* REGMACH8.H
*
* Written by Jake Richter
diff --git a/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c b/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c
index bf4cde495..d413a0ef5 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: I2061Acal.c,v 1.1 95/01/26 15:27:33 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Acal.c,v 3.1 1994/09/07 15:50:41 dawes Exp $ */
/* Id: ICD2061Acal.c,v 4.0 1994/05/28 01:24:17 nygren Exp */
/* Based on the number 9 Inc code */
diff --git a/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c b/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c
index ae43bf9ac..8fa93c034 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: I2061Aset.c,v 1.1 95/01/26 15:27:33 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/I2061Aset.c,v 3.1 1994/09/07 15:50:42 dawes Exp $ */
/* Id: ICD2061Aset.c,v 4.0 1994/05/28 01:24:17 nygren Exp */
/* Based on the number 9 Inc code */
diff --git a/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c b/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c
index 56b48386a..d1c792dc0 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: p9000line.c,v 1.1 95/01/16 12:28:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000line.c,v 3.0 1995/01/15 10:32:03 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c b/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c
index 501ee2cf1..f49164aea 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: p9000seg.c,v 1.1 95/01/16 12:28:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000seg.c,v 3.0 1995/01/15 10:32:05 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile
index cd607e5fb..f878d2133 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:07:37 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:57:14 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/Imakefile,v 3.7 1994/12/17 10:05:29 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/confS3.sh b/xc/programs/Xserver/hw/xfree86/accel/s3/confS3.sh
index 7b8aff635..43d097c28 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/confS3.sh
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/confS3.sh
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: confS3.sh,v 1.1 94/03/28 21:13:24 dpw Exp $
#!/bin/sh
#
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile
index c42b7e183..1e8524b98 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:17:24 dpw Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.2 95/01/06 20:57:24 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/Imakefile,v 3.0 1994/12/25 12:25:21 dawes Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile
index 1519c95a1..8b817e2cd 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:33:29 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:11:02 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/Imakefile,v 3.1 1994/08/01 12:13:47 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c
index 37f927988..f3978d9fc 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mmio_928.c,v 1.2 94/10/12 20:11:02 kaleb Exp kaleb $ */
+/* $XConsortium: mmio_928.c,v 1.3 95/01/16 13:16:55 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/mmio_928/mmio_928.c,v 3.5 1995/01/10 11:18:24 dawes Exp $ */
/*
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile
index 1ba7f5730..c789f83de 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:33:36 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:12:09 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/Imakefile,v 3.0 1994/08/01 12:13:13 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c
index b79a0bc96..7ca342c96 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3_generic.c,v 1.2 94/10/12 20:12:09 kaleb Exp kaleb $ */
+/* $XConsortium: s3_generic.c,v 1.3 95/01/16 13:16:56 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/drivers/s3_generic/s3_generic.c,v 3.2 1995/01/10 10:55:15 dawes Exp $ */
/*
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h b/xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h
index 6ca9e4e88..430c478a6 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h
@@ -1,4 +1,4 @@
-/* $XConsortium: regs3.h,v 1.2 94/10/12 20:07:37 kaleb Exp kaleb $ */
+/* $XConsortium: regs3.h,v 1.3 94/12/27 11:29:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/regs3.h,v 3.10 1994/11/06 09:50:57 dawes Exp $ */
/*
* regs3.h
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c
index 44e69919c..e9951ca6f 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3.c,v 1.8 95/01/25 00:44:45 kaleb Exp Kaleb $ */
+/* $XConsortium: s3.c,v 1.9 95/04/07 19:28:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3.c,v 3.69 1995/01/23 01:29:21 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3.h
index 6cb79ecb5..15956e2d3 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3.h
@@ -1,4 +1,4 @@
-/* $XConsortium: s3.h,v 1.8 95/01/27 14:45:24 kaleb Exp kaleb $ */
+/* $XConsortium: s3.h,v 1.9 95/03/13 16:57:23 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3.h,v 3.18 1995/01/20 04:20:29 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Bt485.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Bt485.h
index 3adde3e32..46c54b2cb 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Bt485.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Bt485.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: s3Bt485.h,v 1.1 94/03/28 21:13:48 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c
index b0841b07c..8bfb66fbf 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3BtCursor.c,v 1.3 95/01/06 20:57:17 kaleb Exp kaleb $ */
+/* $XConsortium: s3BtCursor.c,v 1.4 95/01/16 13:16:49 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3BtCursor.c,v 3.6 1995/01/12 12:03:06 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c
index 256f8e4d5..70bedce66 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: s3Cursor.c,v 1.4 95/01/16 13:16:49 kaleb Exp kaleb $
+ * $XConsortium: s3Cursor.c,v 1.5 95/01/23 15:33:57 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.c,v 3.13 1995/01/21 14:07:34 dawes Exp $
*
* Copyright 1991 MIPS Computer Systems, Inc.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.h
index 419fbd7cd..ccc9045db 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Cursor.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: s3Cursor.h,v 1.1 94/03/28 21:14:07 dpw Exp $ */
extern Bool s3BlockCursor;
extern Bool s3ReloadCursor;
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h
index 4f6705368..1ce7e5ebf 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h
@@ -1,4 +1,4 @@
-/* $XConsortium: s3Ti3020.h,v 1.4 95/01/23 15:33:58 kaleb Exp kaleb $ */
+/* $XConsortium: s3Ti3020.h,v 1.5 95/01/26 15:35:46 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3Ti3020.h,v 3.10 1995/01/26 02:18:20 dawes Exp $ */
/*
* Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c
index dc93ab13b..60d5699f6 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3TiCursor.c,v 1.3 95/01/16 13:16:50 kaleb Exp kaleb $ */
+/* $XConsortium: s3TiCursor.c,v 1.4 95/01/26 15:35:46 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3TiCursor.c,v 3.5 1995/01/26 02:18:22 dawes Exp $ */
/*
* Copyright 1994 by Robin Cutshaw <robin@XFree86.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c
index c2e444a6b..22c098fb1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3bcach.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3bcach.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3bcach.c,v 3.5 1994/09/07 15:51:14 dawes Exp $ */
/*
* Copyright 1993 by Jon Tombs. Oxford University
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c
index aa9344fcc..7887bffbb 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3blt.c,v 1.4 94/11/01 10:29:09 kaleb Exp kaleb $ */
+/* $XConsortium: s3blt.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3blt.c,v 3.8 1994/11/26 12:44:47 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c
index 279c97672..7e02626f3 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3bstor.c,v 1.2 94/10/12 20:07:37 kaleb Exp kaleb $ */
+/* $XConsortium: s3bstor.c,v 1.3 95/01/16 13:16:51 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3bstor.c,v 3.5 1995/01/14 10:47:18 dawes Exp $ */
/*-
* s3bstore.c --
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c
index ccfae5f12..571d40e4a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3cmap.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3cmap.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3cmap.c,v 3.1 1994/08/20 07:33:50 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c
index 5ba617ef8..67f930953 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3dline.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3dline.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3dline.c,v 3.3 1994/09/26 15:31:42 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c
index 1b726a44e..4769b2b0d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3dseg.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3dseg.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3dseg.c,v 3.3 1994/09/26 15:31:44 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c
index 9e2e2cc2c..07ed2bf8d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3fcach.c,v 1.3 95/01/06 20:57:18 kaleb Exp kaleb $ */
+/* $XConsortium: s3fcach.c,v 1.4 95/01/23 15:33:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3fcach.c,v 3.13 1995/01/21 13:04:19 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c
index 2a09e0615..348451567 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3font.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3font.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3font.c,v 3.1 1994/08/01 13:19:36 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c
index 073f5d4e9..6ae5ff41a 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3frect.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3frect.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3frect.c,v 3.3 1994/08/20 07:33:58 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c
index 09368e877..197e2a90e 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3fs.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3fs.c,v 1.4 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3fs.c,v 3.3 1994/08/20 07:34:00 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c
index 8bdedc522..9cfdba5d1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3gc.c,v 1.4 94/10/13 20:21:22 kaleb Exp kaleb $ */
+/* $XConsortium: s3gc.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gc.c,v 3.3 1994/11/26 12:44:49 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c
index 4f4386fea..fb0360060 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3gs.c,v 1.4 94/11/01 10:29:09 kaleb Exp kaleb $ */
+/* $XConsortium: s3gs.c,v 1.5 94/12/27 11:29:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gs.c,v 3.4 1994/11/26 12:44:54 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c
index faee8baa0..3735e19b2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3gtimg.c,v 1.2 94/10/12 20:07:37 kaleb Exp kaleb $ */
+/* $XConsortium: s3gtimg.c,v 1.3 94/12/27 11:29:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3gtimg.c,v 3.4 1994/08/20 07:34:09 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c
index 18e4865ea..907a19480 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3im.c,v 1.5 94/12/29 18:17:29 kaleb Exp kaleb $ */
+/* $XConsortium: s3im.c,v 1.6 95/01/06 20:57:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3im.c,v 3.12 1995/01/02 04:52:11 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.h
index ebe7050c4..33007d0aa 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3im.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: s3im.h,v 1.1 94/03/28 21:15:45 dpw Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c
index 3148adc8a..be6a3a5b1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3init.c,v 1.6 95/01/23 15:34:00 kaleb Exp kaleb $ */
+/* $XConsortium: s3init.c,v 1.7 95/03/13 16:57:23 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3init.c,v 3.51 1995/01/23 01:29:26 dawes Exp $ */
/*
* Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc.,
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c
index 76bfb950e..d7bb1326d 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3line.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3line.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3line.c,v 3.3 1994/09/26 15:31:50 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h
index 375ebe9d2..6d17835b4 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h
@@ -1,4 +1,4 @@
-/* $XConsortium: s3linear.h,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3linear.h,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3linear.h,v 3.3 1994/08/20 07:34:19 dawes Exp $ */
/*
* s3EnableLinear() and s3DisableLinear() are wrappers to surround
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c
index a9b2544d6..d6be629c1 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c
@@ -1,5 +1,5 @@
-/* $XConsortium: s3misc.c,v 1.5 95/01/16 13:16:54 kaleb Exp kaleb $ */
+/* $XConsortium: s3misc.c,v 1.6 95/01/23 15:34:03 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3misc.c,v 3.22 1995/01/23 01:29:30 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile b/xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile
index 5bc06b73c..825566aa2 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:33:50 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:13:35 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3mmio/Imakefile,v 3.4 1994/09/22 15:50:18 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h b/xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h
index a63c4a7bc..091d88354 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h
@@ -1,4 +1,4 @@
-/* $XConsortium: s3name.h,v 1.2 94/10/12 20:07:37 kaleb Exp gildea $ */
+/* $XConsortium: s3name.h,v 1.3 95/06/09 20:57:00 gildea Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3name.h,v 3.4 1994/09/22 15:50:07 dawes Exp $ */
/*
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c
index 665f6dec7..cedb54730 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3plypt.c,v 1.3 94/10/12 20:07:37 kaleb Exp kaleb $ */
+/* $XConsortium: s3plypt.c,v 1.4 95/01/13 19:09:26 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3plypt.c,v 3.2 1994/08/20 07:34:22 dawes Exp $ */
/************************************************************
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c
index d74d82687..92fe4bf24 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3scrin.c,v 1.3 94/10/12 20:07:37 kaleb Exp kaleb $ */
+/* $XConsortium: s3scrin.c,v 1.4 95/01/16 20:07:23 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3scrin.c,v 3.4 1994/09/24 15:12:54 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c
index 40eb5aa69..174df406b 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3seg.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3seg.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3seg.c,v 3.3 1994/09/26 15:31:51 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c
index 8854aff33..d589f3663 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3ss.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3ss.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3ss.c,v 3.3 1994/08/20 07:34:27 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c
index 40d7aeac8..95d8492a8 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3text.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3text.c,v 1.2 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3text.c,v 3.7 1994/09/08 14:26:54 dawes Exp $ */
/*
* Copyright 1992 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c b/xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c
index 8b28c19c8..938c26625 100644
--- a/xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c
+++ b/xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c
@@ -1,4 +1,4 @@
-/* $XConsortium: s3win.c,v 1.1 94/10/05 13:32:36 kaleb Exp $ */
+/* $XConsortium: s3win.c,v 1.3 94/10/12 20:07:37 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/accel/s3/s3win.c,v 3.4 1994/08/20 07:34:31 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/common/Imakefile b/xc/programs/Xserver/hw/xfree86/common/Imakefile
index 20494f74d..d50dd82a4 100644
--- a/xc/programs/Xserver/hw/xfree86/common/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/common/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:57:25 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.5 95/01/26 15:36:06 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common/Imakefile,v 3.14 1995/01/26 02:18:43 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/common/Mach32.c b/xc/programs/Xserver/hw/xfree86/common/Mach32.c
index 3d66c5c05..a64719213 100644
--- a/xc/programs/Xserver/hw/xfree86/common/Mach32.c
+++ b/xc/programs/Xserver/hw/xfree86/common/Mach32.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_Mach32.c,v 1.1 94/03/28 21:21:46 dpw Exp $ */
+/* $XConsortium: Mach32.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach32.c,v 3.3 1994/09/17 13:46:26 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/Mach64.c b/xc/programs/Xserver/hw/xfree86/common/Mach64.c
index ae86e7928..9bc62c654 100644
--- a/xc/programs/Xserver/hw/xfree86/common/Mach64.c
+++ b/xc/programs/Xserver/hw/xfree86/common/Mach64.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_Mach64.c,v 1.1 94/03/28 21:21:46 dpw Exp $ */
+/* $XConsortium: Mach64.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach64.c,v 3.0 1994/11/27 20:42:39 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/Mach8.c b/xc/programs/Xserver/hw/xfree86/common/Mach8.c
index 118ad5316..92a1c24d0 100644
--- a/xc/programs/Xserver/hw/xfree86/common/Mach8.c
+++ b/xc/programs/Xserver/hw/xfree86/common/Mach8.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_Mach8.c,v 1.1 94/03/28 21:21:52 dpw Exp $ */
+/* $XConsortium: Mach8.c,v 1.1 95/01/26 15:26:42 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/Mach8.c,v 3.2 1994/09/07 15:51:41 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/XF86_8514.c b/xc/programs/Xserver/hw/xfree86/common/XF86_8514.c
index 8edb1b712..aae999970 100644
--- a/xc/programs/Xserver/hw/xfree86/common/XF86_8514.c
+++ b/xc/programs/Xserver/hw/xfree86/common/XF86_8514.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_8514.c,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: XF86_8514.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_8514.c,v 3.2 1994/09/07 15:51:38 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c b/xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c
index 58feb5a9a..88586fa22 100644
--- a/xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c
+++ b/xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_Mono.c,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: XF86_Mono.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_Mono.c,v 3.4 1994/09/07 15:51:42 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/XF86_S3.c b/xc/programs/Xserver/hw/xfree86/common/XF86_S3.c
index 1fb6dc643..07ab5b295 100644
--- a/xc/programs/Xserver/hw/xfree86/common/XF86_S3.c
+++ b/xc/programs/Xserver/hw/xfree86/common/XF86_S3.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_S3.c,v 1.2 94/10/12 20:33:21 kaleb Exp kaleb $ */
+/* $XConsortium: XF86_S3.c,v 1.3 95/01/05 20:39:33 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_S3.c,v 3.7 1994/12/05 04:06:50 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c b/xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c
index 5fae957d7..1b714d413 100644
--- a/xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c
+++ b/xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_SVGA.c,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: XF86_SVGA.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_SVGA.c,v 3.4 1994/09/07 15:51:45 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c b/xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c
index 8cbf0a8ae..5686061f2 100644
--- a/xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c
+++ b/xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c
@@ -1,4 +1,4 @@
-/* $XConsortium: XF86_VGA16.c,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: XF86_VGA16.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/XF86_VGA16.c,v 3.3 1994/09/07 15:51:46 dawes Exp $ */
#include "X.h"
#include "os.h"
diff --git a/xc/programs/Xserver/hw/xfree86/common/atKeynames.h b/xc/programs/Xserver/hw/xfree86/common/atKeynames.h
index 26d202442..01f907e6e 100644
--- a/xc/programs/Xserver/hw/xfree86/common/atKeynames.h
+++ b/xc/programs/Xserver/hw/xfree86/common/atKeynames.h
@@ -1,4 +1,4 @@
-/* $XConsortium: atKeynames.h,v 1.5 95/01/06 20:57:26 kaleb Exp kaleb $ */
+/* $XConsortium: atKeynames.h,v 1.6 95/01/13 19:19:20 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.1 1994/12/11 10:54:28 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/coKeynames.h b/xc/programs/Xserver/hw/xfree86/common/coKeynames.h
index 85e25ecd4..84fed9878 100644
--- a/xc/programs/Xserver/hw/xfree86/common/coKeynames.h
+++ b/xc/programs/Xserver/hw/xfree86/common/coKeynames.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: coKeynames.h,v 1.1 94/03/28 21:22:29 dpw Exp $ */
/*
* This file is derived from "atKeynames.h"
* Written by Holger Veit (veit@du9ds3.uni-duisburg.de)
diff --git a/xc/programs/Xserver/hw/xfree86/common/compiler.h b/xc/programs/Xserver/hw/xfree86/common/compiler.h
index a4508217e..f7e2c0394 100644
--- a/xc/programs/Xserver/hw/xfree86/common/compiler.h
+++ b/xc/programs/Xserver/hw/xfree86/common/compiler.h
@@ -1,4 +1,4 @@
-/* $XConsortium: compiler.h,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: compiler.h,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.1 1994/07/24 11:49:16 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86.h b/xc/programs/Xserver/hw/xfree86/common/xf86.h
index b5a7aad62..c82be8753 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86.h,v 1.4 95/01/06 20:57:27 kaleb Exp kaleb $ */
+/* $XConsortium: xf86.h,v 1.5 95/01/16 13:16:56 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.13 1995/01/10 10:23:38 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Config.c b/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
index e8f7d60b8..ee719138d 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Config.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xf86Config.c,v 1.5 95/01/06 20:57:28 kaleb Exp kaleb $
+ * $XConsortium: xf86Config.c,v 1.6 95/01/16 13:16:57 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.34 1995/01/11 03:50:32 dawes Exp $
*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c b/xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c
index 9eb472c57..413a3d550 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Cursor.c,v 1.2 95/01/05 20:39:33 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Cursor.c,v 1.3 95/01/06 20:57:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.3 1994/12/11 10:54:36 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Events.c b/xc/programs/Xserver/hw/xfree86/common/xf86Events.c
index dd56abf77..4f4557295 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Events.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Events.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Events.c,v 1.12 95/03/14 21:22:15 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Events.c,v 1.13 95/04/05 19:58:45 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.8 1995/01/11 03:50:36 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Init.c b/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
index 680a25b4d..6b49e07b1 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Init.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xf86Init.c,v 1.7 95/01/10 14:42:18 kaleb Exp kaleb $
+ * $XConsortium: xf86Init.c,v 1.8 95/01/16 13:17:00 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.14 1995/01/07 04:07:28 dawes Exp $
*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Io.c b/xc/programs/Xserver/hw/xfree86/common/xf86Io.c
index ba6f9869b..cc9d3b02b 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Io.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Io.c,v 1.5 95/01/06 20:57:35 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Io.c,v 1.6 95/01/16 20:07:54 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.3 1994/12/17 10:06:11 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c b/xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c
index 22272233d..2d4da5cda 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Kbd.c,v 1.5 95/01/10 14:58:26 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Kbd.c,v 1.6 95/01/23 15:34:04 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c,v 3.4 1995/01/21 07:15:47 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c b/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
index 943b98b89..7ab03d0fb 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_KbdBSD.c,v 1.1 94/03/28 21:23:59 dpw Exp $ */
+/* $XConsortium: xf86KbdBSD.c,v 1.1 95/01/26 15:26:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.4 1995/01/10 10:23:50 dawes Exp $ */
/*
* Derived from xf86Kbd.c by S_ren Schmidt (sos@login.dkuug.dk)
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c b/xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c
index 35b56494d..7ac3d6560 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_KbdLnx.c,v 1.1 94/03/28 21:24:06 dpw Exp $ */
+/* $XConsortium: xf86KbdLnx.c,v 1.1 95/01/26 15:26:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v 3.4 1994/12/11 10:54:45 dawes Exp $ */
/*
* Linux version of keymapping setup. The kernel (since 0.99.14) has support
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c b/xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c
index ff86d48da..a6d30fce1 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86KbdMach.c,v 1.5 95/01/06 20:57:37 kaleb Exp kaleb $ */
+/* $XConsortium: xf86KbdMach.c,v 1.6 95/01/13 19:20:17 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.2 1994/12/11 10:54:40 dawes Exp $ */
/*
*****************************************************************************
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h b/xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h
index d7deb52ec..04c84dd97 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Keymap.h,v 1.7 95/01/13 19:22:22 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Keymap.h,v 1.8 95/01/23 15:34:05 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.3 1995/01/23 01:29:46 dawes Exp $ */
/*
* For Scancodes see notes in atKeynames.h !!!!
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Lock.c b/xc/programs/Xserver/hw/xfree86/common/xf86Lock.c
index 088b9a570..231afc924 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Lock.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Lock.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Lock.c,v 1.2 94/12/13 20:12:47 kaleb Exp $ */
+/* $XConsortium: xf86Lock.c,v 1.3 95/01/06 21:01:52 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Lock.c,v 3.1 1994/12/29 10:07:30 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h b/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h
index 88ee9648c..f57e4cae8 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Priv.h,v 1.4 95/01/05 20:40:37 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Priv.h,v 1.5 95/01/16 13:17:01 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.5 1995/01/11 03:50:38 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Procs.h b/xc/programs/Xserver/hw/xfree86/common/xf86Procs.h
index 86af1861a..28c7076ae 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Procs.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Procs.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Procs.h,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: xf86Procs.h,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Procs.h,v 3.0 1994/06/19 11:05:34 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86_Config.h b/xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
index cc88c3502..ed8ef5036 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86_Config.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_Config.h,v 1.4 95/01/06 20:57:39 kaleb Exp kaleb $ */
+/* $XConsortium: xf86_Config.h,v 1.5 95/01/16 13:17:02 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Config.h,v 3.19 1995/01/11 03:50:39 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c b/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
index 087691810..5dd9f8408 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_Mouse.c,v 1.1 94/10/05 13:34:15 kaleb Exp $ */
+/* $XConsortium: xf86_Mouse.c,v 1.2 94/10/12 20:33:21 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Mouse.c,v 3.0 1994/09/23 10:13:17 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86_Option.c b/xc/programs/Xserver/hw/xfree86/common/xf86_Option.c
index 74bcf1e85..67f953631 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86_Option.c
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86_Option.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: xf86_Option.c,v 1.1 94/03/28 21:24:19 dpw Exp $ */
/*
*
* The purpose of this file is to initialise the xf86_OptionTab[] which
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86_Option.h b/xc/programs/Xserver/hw/xfree86/common/xf86_Option.h
index 106d96061..18e42b787 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86_Option.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86_Option.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_Option.h,v 1.5 95/01/16 13:17:04 kaleb Exp kaleb $ */
+/* $XConsortium: xf86_Option.h,v 1.6 95/01/23 15:34:06 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86_Option.h,v 3.20 1995/01/20 04:21:00 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/ATTDac.c b/xc/programs/Xserver/hw/xfree86/common_hw/ATTDac.c
index 174e3cc91..88185b31a 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/ATTDac.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/ATTDac.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ATTDac.c,v 1.1 94/03/28 21:24:32 dpw Exp $ */
/*
* Copyright 1994 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.s b/xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.s
index f727deb1e..2b6e7517b 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.s
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/BUSmemcpy.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: BUSmemcpy.s,v 1.2 94/03/29 10:25:10 dpw Exp $ */
/******************************************************************************
Copyright 1993 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c b/xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c
index 943d74745..06bf580e3 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: Ch8391clk.c,v 1.1 95/01/23 15:03:54 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/Ch8391clk.c,v 3.1 1995/01/21 14:07:57 dawes Exp $ */
/*
* Copyright 1995 The XFree86 Project, Inc
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c b/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c
index 5d251d650..a126d0cfd 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: CirrusClk.c,v 1.4 95/01/27 14:46:39 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.c,v 3.4 1995/01/15 10:33:34 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h b/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h
index 6abddd6da..82b9fbd53 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: CirrusClk.h,v 1.2 95/01/27 14:46:39 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/CirrusClk.h,v 3.0 1994/10/20 06:09:42 dawes Exp $ */
int CirrusFindClock(
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c b/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c
index ae333f3af..107ee1181 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ICD2061Aalt.c,v 1.1 94/03/28 21:24:51 dpw Exp $ */
+/* $XConsortium: I2061Aalt.c,v 1.1 95/01/26 15:25:49 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/I2061Aalt.c,v 3.3 1995/01/20 04:21:16 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/I2061Acal.c b/xc/programs/Xserver/hw/xfree86/common_hw/I2061Acal.c
index f33f1ba90..bac72ffa5 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/I2061Acal.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/I2061Acal.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ICD2061Acal.c,v 1.1 94/03/28 21:24:57 dpw Exp $ */
+/* $XConsortium: I2061Acal.c,v 1.1 95/01/26 15:25:49 kaleb Exp $ */
/* Based on the number 9 Inc code */
/* Copyright (c) 1992, Number Nine Computer Corp. All Rights Reserved.
*
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aset.c b/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aset.c
index 271c66e4a..14c4464c9 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aset.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/I2061Aset.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ICD2061Aset.c,v 1.1 94/03/28 21:25:04 dpw Exp $ */
+/* $XConsortium: I2061Aset.c,v 1.1 95/01/26 15:25:49 kaleb Exp $ */
/* Based on the number 9 Inc code */
/* Copyright (c) 1992, Number Nine Computer Corp. All Rights Reserved.
*
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/ICD2061A.h b/xc/programs/Xserver/hw/xfree86/common_hw/ICD2061A.h
index b48c8ed06..9bf17bdc2 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/ICD2061A.h
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/ICD2061A.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ICD2061A.h,v 1.1 94/03/28 21:24:45 dpw Exp $ */
/* Based on the number 9 Inc code */
/* Copyright (c) 1992, Number Nine Computer Corp. All Rights Reserved.
*
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/Imakefile b/xc/programs/Xserver/hw/xfree86/common_hw/Imakefile
index c4154b569..186cd0a0b 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 95/01/23 15:34:08 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.6 95/01/26 15:36:36 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/Imakefile,v 3.7 1995/01/26 02:18:59 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c b/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c
index e01541e7e..6e039cba4 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c
@@ -1,4 +1,4 @@
-/* $XConsortium: SC11412.c,v 1.2 94/10/12 20:38:44 kaleb Exp kaleb $ */
+/* $XConsortium: SC11412.c,v 1.3 95/01/05 20:41:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/SC11412.c,v 3.1 1994/11/05 23:44:05 dawes Exp $ */
/* Norbert Distler ndistler@physik.tu-muenchen.de */
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.h b/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.h
index e69acf64f..613327ab6 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.h
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/SC11412.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: SC11412.h,v 1.1 94/03/28 21:25:22 dpw Exp $ */
/* Norbert Distler ndistler@physik.tu-muenchen.de */
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c b/xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c
index 6e4e5a200..05de7b1a4 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_ClkPr.c,v 1.2 94/10/12 20:38:44 kaleb Exp kaleb $ */
+/* $XConsortium: xf86_ClkPr.c,v 1.3 95/01/05 20:41:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/xf86_ClkPr.c,v 3.3 1994/11/26 12:45:59 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h b/xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h
index bdc7054da..81efc618c 100644
--- a/xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h
+++ b/xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_HWlib.h,v 1.4 95/01/16 13:17:08 kaleb Exp kaleb $ */
+/* $XConsortium: xf86_HWlib.h,v 1.5 95/01/23 15:34:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common_hw/xf86_HWlib.h,v 3.7 1995/01/21 14:07:59 dawes Exp $ */
/*
* Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL b/xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL
index 9e5345387..e998100b8 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL
+++ b/xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL
@@ -293,4 +293,4 @@ XFree86 3.1 $@$rF|K\$G%$%s%9%H!<%k$9$k?M8~$1$KK]Lu$7$?$b$N$G$9!#$3$3$,$*$+$7$$
$XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/INSTALL,v 3.0 1995/01/12 12:03:50 dawes Exp $
-$XConsortium: INSTALL,v 1.1 95/01/16 12:30:09 kaleb Exp $
+$XConsortium: INSTALL,v 1.1 95/01/16 12:30:46 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile b/xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile
index 403f87a16..597c31015 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 95/01/16 12:30:09 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.1 95/01/16 12:30:46 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/Imakefile,v 3.0 1995/01/12 12:03:51 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/Japanese/README b/xc/programs/Xserver/hw/xfree86/doc/Japanese/README
index be0744c10..698f21516 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/Japanese/README
+++ b/xc/programs/Xserver/hw/xfree86/doc/Japanese/README
@@ -548,5 +548,5 @@ README $@%U%!%$%k$N%3%s%Q%$%k;~4V%*%W%7%g%s$NA*Br$r$_$k$H!"G[IUJ*$,:n@.$5$l$F(
1994$@G/(J 10$@7n(J 2$@F|(J
$XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README,v 3.0 1995/01/12 12:03:53 dawes Exp $
-$XConsortium: README,v 1.1 95/01/16 12:30:09 kaleb Exp $
+$XConsortium: README,v 1.1 95/01/16 12:30:46 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config b/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config
index fc40977c7..4d0d9345c 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config
+++ b/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config
@@ -492,4 +492,4 @@ Display $@@a$N:G8e$N@_Dj$O!"%G%#%9%W%l%$$N%b!<%I$N@_Dj$G$9!#%5!<%P!<$N;HMQ$7$h
$XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Config,v 3.0 1995/01/12 12:03:54 dawes Exp $
-$XConsortium: README.Config,v 1.1 95/01/16 12:30:09 kaleb Exp $
+$XConsortium: README.Config,v 1.1 95/01/16 12:30:46 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux b/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux
index ffefdd172..7b44e3fc9 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux
+++ b/xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux
@@ -181,5 +181,5 @@ Orest Zborowski (orestz@eskimo.com) $@;a$,3+H/$7$?:G?7$NJ}K!$G!"A4$F$N>\:Y@bL@
$@%s%H$O(J orestz@eskimo.com $@$G9T$J$o$l$F$$$^$9!#(J
$XFree86: xc/programs/Xserver/hw/xfree86/doc/Japanese/README.Linux,v 3.0 1995/01/12 12:03:55 dawes Exp $
-$XConsortium: README.Linux,v 1.1 95/01/16 12:30:09 kaleb Exp $
+$XConsortium: README.Linux,v 1.1 95/01/16 12:30:46 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/README.Oak b/xc/programs/Xserver/hw/xfree86/doc/README.Oak
index 1d3384d8d..2e3e2612d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/README.Oak
+++ b/xc/programs/Xserver/hw/xfree86/doc/README.Oak
@@ -132,4 +132,4 @@
$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.Oak,v 3.1 1995/01/21 11:10:15 dawes Exp $
-$XConsortium: $
+$XConsortium: README.Oak,v 1.1 95/01/23 15:04:38 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/README.isc b/xc/programs/Xserver/hw/xfree86/doc/README.isc
index 5f11cfbdf..1c0f0f06d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/README.isc
+++ b/xc/programs/Xserver/hw/xfree86/doc/README.isc
@@ -396,4 +396,4 @@
$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.isc,v 3.7 1995/01/27 10:30:40 dawes Exp $
-$XConsortium: README.isc,v 1.4 95/01/16 13:17:32 kaleb Exp kaleb $
+$XConsortium: README.isc,v 1.5 95/01/27 15:58:21 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml
index a0f00cc23..4830e795a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml
@@ -309,7 +309,7 @@ instructions on how to build a new kernel.
</verb>
<verb>
-$XConsortium: Bsdi.sgml,v 1.2 95/01/16 13:17:39 kaleb Exp kaleb $
+$XConsortium: Bsdi.sgml,v 1.3 95/01/23 15:34:39 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Bsdi.sgml,v 3.7 1995/01/22 03:06:27 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml
index 170fb632d..bfa1d246d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml
@@ -32,7 +32,7 @@ XFree86 Project.
<verb>
-$XConsortium: CPYRIGHT.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: CPYRIGHT.sgml,v 1.2 95/01/16 13:17:39 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml,v 3.2 1995/01/08 07:00:02 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml
index df3b0e94e..1fb6fe32d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml
@@ -519,7 +519,7 @@ installation.
</code>
<verb>
-$XConsortium: Config.sgml,v 1.2 95/01/16 13:17:40 kaleb Exp kaleb $
+$XConsortium: Config.sgml,v 1.3 95/01/23 15:34:40 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Config.sgml,v 3.4 1995/01/21 07:16:30 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml
index e8301e97f..68f927c2d 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml
@@ -70,7 +70,7 @@
<verb>
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DocIndex.sgml,v 3.1 1995/01/25 11:08:44 dawes Exp $
-$XConsortium: DocIndex.sgml,v 1.1 95/01/23 15:05:12 kaleb Exp kaleb $
+$XConsortium: DocIndex.sgml,v 1.2 95/01/27 16:14:23 kaleb Exp $
</verb>
</article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml
index 85cda4c89..18aaaeb3a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml
@@ -570,7 +570,7 @@ Many thanks to:
</itemize>
<verb>
-$XConsortium: FreeBSD.sgml,v 1.2 95/01/16 13:17:41 kaleb Exp kaleb $
+$XConsortium: FreeBSD.sgml,v 1.3 95/01/23 15:34:41 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/FreeBSD.sgml,v 3.8 1995/01/21 10:44:19 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml
index ab80ca020..22033e154 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml
@@ -294,7 +294,7 @@ details of how to do this, please refer to the <url url="LinKit.html"
name="README.LinkKit"> file.
<verb>
-$XConsortium: INSTALL.sgml,v 1.3 95/01/23 15:34:42 kaleb Exp kaleb $
+$XConsortium: INSTALL.sgml,v 1.4 95/01/27 16:14:24 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/INSTALL.sgml,v 3.5 1995/01/25 11:51:33 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile b/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
index 5ceff40ef..c708fe6f9 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.2 95/01/23 15:34:43 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Imakefile,v 3.4 1995/01/19 05:22:47 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml
index f3933cf24..20720b980 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml
@@ -110,7 +110,7 @@
</enum>
<verb>
-$XConsortium: LinkKit.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: LinkKit.sgml,v 1.2 95/01/16 13:17:43 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LinkKit.sgml,v 3.2 1995/01/14 10:47:43 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml
index 112a1e315..4d7df9560 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml
@@ -175,7 +175,7 @@ about Linux support or the Linux distribution should be made to
<it>orestz@eskimo.com.</it>
<verb>
-$XConsortium: Linux.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: Linux.sgml,v 1.2 95/01/23 15:34:44 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Linux.sgml,v 3.4 1995/01/23 01:30:03 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml
index eeaa140bd..2677483a3 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml
@@ -171,7 +171,7 @@ necessary for Mach is that the X servers be able to open <tt>/dev/iopl</tt>
read/write. There are many ways to achieve this effect.
<verb>
-$XConsortium: Mach.sgml,v 1.2 95/01/23 15:34:45 kaleb Exp kaleb $
+$XConsortium: Mach.sgml,v 1.3 95/01/27 16:14:25 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Mach.sgml,v 3.3 1995/01/25 11:08:48 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml
index 4ecb0995a..4dee75395 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml
@@ -618,7 +618,7 @@ and many others.
</itemize>
<verb>
-$XConsortium: NetBSD.sgml,v 1.3 95/01/23 15:34:46 kaleb Exp kaleb $
+$XConsortium: NetBSD.sgml,v 1.4 95/01/27 16:14:26 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/NetBSD.sgml,v 3.8 1995/01/27 10:31:27 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml
index 0ff6f83b6..37c1c8204 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml
@@ -120,7 +120,7 @@ Option &dquot;favour_bitblt&dquot; (OTI087)
<verb>
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Oak.sgml,v 3.2 1995/01/21 07:16:36 dawes Exp $
-$XConsortium: $
+$XConsortium: Oak.sgml,v 1.1 95/01/23 15:05:36 kaleb Exp $
</verb>
</article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml
index bf54616b7..b1ae977e4 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml
@@ -414,7 +414,7 @@ During the course of the next few months, people will be working on
acceleration, etc. Please send any patches to me (<it>nygren@mit.edu</it>).
<verb>
-$XConsortium: P9000.sgml,v 1.3 95/01/23 15:34:47 kaleb Exp kaleb $
+$XConsortium: P9000.sgml,v 1.4 95/01/27 16:14:28 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/P9000.sgml,v 3.7 1995/01/25 11:08:51 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
index c0775d289..21f9c0435 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml
@@ -810,7 +810,7 @@ file that describes what files you need to take from the archive, and which
compile-time option selections were made when building the distribution.
<verb>
-$XConsortium: README.sgml,v 1.3 95/01/23 15:34:48 kaleb Exp kaleb $
+$XConsortium: README.sgml,v 1.4 95/01/27 16:14:29 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.16 1995/01/25 11:51:37 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml
index fbae6260c..e28aca50c 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml
@@ -484,7 +484,7 @@ exit
</code>
<verb>
-$XConsortium: S3.sgml,v 1.5 95/01/26 15:47:06 kaleb Exp kaleb $
+$XConsortium: S3.sgml,v 1.6 95/01/27 16:14:30 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/S3.sgml,v 3.11 1995/01/26 02:19:15 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml
index 907b6ab30..9856e3135 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml
@@ -582,7 +582,7 @@ for providing an
ftp site for the binary distribution.
<verb>
-$XConsortium: SCO.sgml,v 1.3 95/01/23 15:34:50 kaleb Exp kaleb $
+$XConsortium: SCO.sgml,v 1.4 95/01/27 16:14:31 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SCO.sgml,v 3.5 1995/01/25 11:08:52 dawes Exp $
</verb>
</article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml
index 737982ec7..90e6653da 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml
@@ -296,7 +296,7 @@ Xserver.
<verb>
-$XConsortium: SOLX86.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: SOLX86.sgml,v 1.2 95/01/16 13:17:48 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SOLX86.sgml,v 3.2 1995/01/15 10:34:23 dawes Exp $
</verb>
</article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml
index b53528512..985da33fd 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml
@@ -419,7 +419,7 @@ workaround for this problem, and giving us permission to release the
information.<p>
<verb>
-$XConsortium: SVR4.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: SVR4.sgml,v 1.2 95/01/16 13:17:49 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml,v 3.2 1995/01/15 10:34:24 dawes Exp $
</verb>
</article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml
index 5bfaf1af0..5a73baa3a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml
@@ -903,7 +903,7 @@ Sunnyvale, CA 94086 <newline>
</descrip>
<verb>
-$XConsortium: VGADriv.sgml,v 1.2 95/01/16 13:17:49 kaleb Exp kaleb $
+$XConsortium: VGADriv.sgml,v 1.3 95/01/23 15:34:51 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VGADriv.sgml,v 3.4 1995/01/21 10:44:34 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml
index fdd40e98e..5d94d784a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml
@@ -1146,7 +1146,7 @@ Finally, remember that increasing either frame length will decrease your
refresh rate, and vice-versa.
<verb>
-$XConsortium: VidModes.sgml,v 1.2 95/01/23 15:34:53 kaleb Exp kaleb $
+$XConsortium: VidModes.sgml,v 1.3 95/01/27 16:14:33 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/VidModes.sgml,v 3.4 1995/01/25 11:08:55 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml
index 1b9ec0e8e..406829526 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml
@@ -96,7 +96,7 @@ an INT 10 call, but you can't do this in a user process.<p>
</quote>
<verb>
-$XConsortium: $
+$XConsortium: Video7.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Video7.sgml,v 3.1 1994/12/26 11:03:40 dawes Exp $
</verb>
</article>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml
index a2dd85f3e..7a2ca3cc5 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml
@@ -86,7 +86,7 @@ listed below:
<!-- moved author name to title page. -->
<verb>
-$XConsortium: W32.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: W32.sgml,v 1.2 95/01/23 15:34:55 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/W32.sgml,v 3.2 1995/01/20 05:21:46 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml
index 06f7038ed..b63cad02e 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml
@@ -53,7 +53,7 @@ If the clocks detected by the server show a very low last clock
(under 28Mhz), then this option is likely needed.
<verb>
-$XConsortium: WstDig.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: WstDig.sgml,v 1.2 95/01/16 13:17:51 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/WstDig.sgml,v 3.1 1995/01/11 09:47:54 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml
index 4cd91e4f9..e349cd6a0 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml
@@ -514,7 +514,7 @@ Set or clear CPU access wait state, default is the POST setting.
<p>
<verb>
-$XConsortium: agx.sgml,v 1.3 95/01/23 15:34:56 kaleb Exp kaleb $
+$XConsortium: agx.sgml,v 1.4 95/01/27 16:14:35 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/agx.sgml,v 3.6 1995/01/25 11:08:57 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
index 08da69abf..dc1785430 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml
@@ -244,7 +244,7 @@ Please e-mail any bug reports, comments, etc. to <bf>Marc Aurele La France
<p>
<verb>
-$XConsortium: $
+$XConsortium: ati.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/ati.sgml,v 3.2 1995/01/04 04:40:33 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml
index 157db4b86..ad7f71e54 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml
@@ -673,7 +673,7 @@ New features in XFree86 3.1.1:
</itemize>
<verb>
-$XConsortium: cirrus.sgml,v 1.3 95/01/23 15:34:57 kaleb Exp kaleb $
+$XConsortium: cirrus.sgml,v 1.4 95/01/27 16:14:36 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cirrus.sgml,v 3.8 1995/01/27 04:51:53 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml
index 7798c2316..cc6b36fa6 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml
@@ -73,7 +73,7 @@ The idea of using an external clock program was suggested by
Frank Klemm &lt;<it>pfk@rz.uni-jena.de</it>&gt;
<verb>
-$XConsortium: $
+$XConsortium: clkprog.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/clkprog.sgml,v 3.1 1995/01/04 04:40:36 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml
index b94c35a7c..269d17105 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml
@@ -324,7 +324,7 @@ as to all who contribute to this excellent piece of free software.
<verb>
-$XConsortium: $
+$XConsortium: isc.sgml,v 1.2 95/01/27 16:14:38 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/isc.sgml,v 3.3 1995/01/27 04:51:55 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml
index efb5b57da..27e8490f3 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml
@@ -87,7 +87,7 @@ clock speed. So be prepared for this phenomenon to occur, and have the board
documentation handy.
<verb>
-$XConsortium: $
+$XConsortium: trident.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/trident.sgml,v 3.0 1994/12/20 11:33:47 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml
index d180665a5..b5e7d4743 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml
@@ -54,7 +54,7 @@ has been removed. Hopefully the past text-restoration problems are alleviated
in XFree86 2.0.
<verb>
-$XConsortium: tseng.sgml,v 1.1 95/01/06 20:29:55 kaleb Exp kaleb $
+$XConsortium: tseng.sgml,v 1.2 95/01/23 15:34:58 kaleb Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/tseng.sgml,v 3.3 1995/01/21 10:44:40 dawes Exp $
</verb>
diff --git a/xc/programs/Xserver/hw/xfree86/etc/2key.c b/xc/programs/Xserver/hw/xfree86/etc/2key.c
index cce6f1ef4..cffbdc49b 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/2key.c
+++ b/xc/programs/Xserver/hw/xfree86/etc/2key.c
@@ -1,6 +1,6 @@
/*
* $XFree86: xc/programs/Xserver/hw/xfree86/etc/2key.c,v 3.1 1994/09/23 10:18:23 dawes Exp $
- * $XConsortium: $
+ * $XConsortium: 2key.c,v 1.1 95/01/25 23:45:59 kaleb Exp $
*
* Enable/disable the 2-key VT switching sequences for Esix SVR4
* Note that is program *only* works for Esix SVR4. To use this program
diff --git a/xc/programs/Xserver/hw/xfree86/etc/install.sv3 b/xc/programs/Xserver/hw/xfree86/etc/install.sv3
index f2f4c49bd..e257faa6e 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/install.sv3
+++ b/xc/programs/Xserver/hw/xfree86/etc/install.sv3
@@ -27,7 +27,7 @@
# Changed for XFree86 3.1 to coexist with Interactive X11 by Michael Rohleder
# (michael.rohleder%iktffm.uucp@Germany.EU.net)
-# $XConsortium: $
+# $XConsortium: install.sv3,v 1.1 95/01/26 15:25:15 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/install.sv3,v 3.1 1995/01/11 03:51:22 dawes Exp $
#
diff --git a/xc/programs/Xserver/hw/xfree86/etc/install.sv4 b/xc/programs/Xserver/hw/xfree86/etc/install.sv4
index c44a414aa..9a5dd0d1b 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/install.sv4
+++ b/xc/programs/Xserver/hw/xfree86/etc/install.sv4
@@ -23,7 +23,7 @@
# Author: Thomas Roell, roell@informatik.tu-muenchen.de
#
-# $XConsortium: $
+# $XConsortium: install.sv4,v 1.1 95/01/26 15:25:15 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/install.sv4,v 3.0 1994/06/05 05:57:05 dawes Exp $
#
diff --git a/xc/programs/Xserver/hw/xfree86/etc/sun.tcap b/xc/programs/Xserver/hw/xfree86/etc/sun.tcap
index 02c099ab7..32c81eef9 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/sun.tcap
+++ b/xc/programs/Xserver/hw/xfree86/etc/sun.tcap
@@ -1,4 +1,4 @@
-# $XConsortium: $
+# $XConsortium: sun.tcap,v 1.1 95/01/26 15:24:23 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/sun.tcap,v 3.0 1994/06/05 05:57:20 dawes Exp $
#
Mu|sun|Sun Microsystems Workstation console:\
diff --git a/xc/programs/Xserver/hw/xfree86/etc/sun.tinfo b/xc/programs/Xserver/hw/xfree86/etc/sun.tinfo
index 016254705..25b0cfe49 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/sun.tinfo
+++ b/xc/programs/Xserver/hw/xfree86/etc/sun.tinfo
@@ -1,4 +1,4 @@
-# $XConsortium: $
+# $XConsortium: sun.tinfo,v 1.1 95/01/26 15:24:23 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/sun.tinfo,v 3.0 1994/06/05 05:57:21 dawes Exp $
#
sun|Sun Microsystems Workstation console,
diff --git a/xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch b/xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch
index 8c3afae56..019804bbe 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch
+++ b/xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch
@@ -1,7 +1,7 @@
#!/bin/sh
######################################################################
#
-# $XConsortium: $
+# $XConsortium: svr3_rem_pch,v 1.1 95/01/26 15:22:00 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/svr3_rem_pch,v 3.0 1994/06/05 05:57:24 dawes Exp $
#
# Back out the patch to kernel that prevents losing IOPL on signals.
diff --git a/xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch b/xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch
index a1363d312..7ab5a4b3e 100644
--- a/xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch
+++ b/xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch
@@ -1,7 +1,7 @@
#!/bin/sh
######################################################################
#
-# $XConsortium: $
+# $XConsortium: svr4_rem_pch,v 1.1 95/01/26 15:22:00 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/etc/svr4_rem_pch,v 3.0 1994/06/05 05:57:26 dawes Exp $
#
# Back out the patch to kernel that prevents losing IOPL on signals.
diff --git a/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info b/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info
index 2d9e8770f..7fd870967 100644
--- a/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info
+++ b/xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info
@@ -86,4 +86,4 @@ reg: def. for graph. - description
61 - fixed 85 (?)
$XFree86: xc/programs/Xserver/hw/xfree86/mono/drivers/hgc1280/HGC1280.info,v 3.0 1994/05/04 15:01:08 dawes Exp $
-$XConsortium: $
+$XConsortium: HGC1280.info,v 1.1 95/01/25 23:44:47 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
index 5c0381220..7b568df5e 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:40:57 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:43:43 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.3 1994/06/05 13:46:28 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib b/xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib
index 2bb68c53f..396098240 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib
+++ b/xc/programs/Xserver/hw/xfree86/os-support/README.OS-lib
@@ -426,4 +426,4 @@ void xf86OsMouseOption(int token, pointer lex_ptr)
*/
}
-$XConsortium: $
+$XConsortium: README.OS-lib,v 1.2 95/06/19 18:20:06 kaleb Exp $
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile
index f8f124386..a7cbbb764 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:27:22 dpw Exp $
#include <Server.tmpl>
#if AckToolset
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c
index 6e23842b5..eddcd4b95 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: am_init.c,v 1.2 94/10/12 20:44:34 kaleb Exp kaleb $ */
+/* $XConsortium: am_init.c,v 1.3 95/01/05 20:41:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_init.c,v 3.1 1994/10/23 12:59:40 dawes Exp $ */
/*
* Copyright 1993 by Vrije Universiteit, The Netherlands
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c
index a3bfa4dc2..a373f2dda 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: am_io.c,v 1.2 95/06/09 20:57:00 gildea Exp kaleb $ */
+/* $XConsortium: am_io.c,v 1.3 95/06/14 15:19:17 kaleb Exp $ */
/*
* Copyright 1993 by Vrije Universiteit, The Netherlands
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_video.c b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_video.c
index 085dec101..f8fc8ae3e 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/amoeba/am_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: am_video.c,v 1.1 94/03/28 21:27:41 dpw Exp $ */
/*
* Copyright 1993 by Vrije Universiteit, The Netherlands
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/assyntax.h b/xc/programs/Xserver/hw/xfree86/os-support/assyntax.h
index b9d512567..6dec06da1 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/assyntax.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/assyntax.h
@@ -1,4 +1,4 @@
-/* $XConsortium: assyntax.h,v 1.1 94/03/28 21:26:59 dpw Exp kaleb $ */
+/* $XConsortium: assyntax.h,v 1.2 95/01/05 20:43:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.0 1994/10/21 11:23:25 dawes Exp $ */
#ifndef __ASSYNTAX_H__
#define __ASSYNTAX_H__
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
index 134f175df..255f4f4e2 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:45:13 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:15 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile,v 3.1 1994/12/10 02:14:51 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c
index e64fcee27..d95de0194 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsd_VTsw.c,v 1.1 94/03/28 21:27:54 dpw Exp kaleb $ */
+/* $XConsortium: bsd_VTsw.c,v 1.2 95/01/16 13:17:56 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.1 1995/01/10 11:14:09 dawes Exp $ */
/*
* Derived from VTsw_usl.c which is
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c
index d1c5fbcd5..e085a8af8 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsd_init.c,v 1.3 95/01/05 20:42:11 kaleb Exp kaleb $ */
+/* $XConsortium: bsd_init.c,v 1.4 95/01/16 13:17:57 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.2 1995/01/10 10:28:45 dawes Exp $ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c
index d31aa23a7..cc00f7996 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsd_io.c,v 1.4 95/06/09 20:57:00 gildea Exp kaleb $ */
+/* $XConsortium: bsd_io.c,v 1.5 95/06/14 15:19:17 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.2 1995/01/10 10:28:47 dawes Exp $ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
index 177f7fbce..f2a74485c 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsd_video.c,v 1.1 94/10/05 13:41:29 kaleb Exp $ */
+/* $XConsortium: bsd_video.c,v 1.2 94/10/12 20:45:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_video.c,v 3.3 1994/09/07 15:54:02 dawes Exp $ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile
index d68ecf3ae..7a968edbb 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:28:19 dpw Exp $
#include <Server.tmpl>
SRCS = bsdi_init.c bsdi_video.c IO_utils.c bsdi_io.c bios_devmem.c \
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c
index 1b0c320f5..866c8f064 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsdi_init.c,v 1.1 94/10/05 13:41:38 kaleb Exp $ */
+/* $XConsortium: bsdi_init.c,v 1.2 94/10/12 20:46:00 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_init.c,v 3.0 1994/09/23 10:24:39 dawes Exp $ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c
index 48f03d6bc..620159504 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsdi_io.c,v 1.2 95/06/09 20:57:00 gildea Exp kaleb $ */
+/* $XConsortium: bsdi_io.c,v 1.3 95/06/14 15:19:17 kaleb Exp $ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c
index bbe245a97..e8cfad156 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bsdi_video.c,v 1.1 94/03/28 21:28:38 dpw Exp kaleb $ */
+/* $XConsortium: bsdi_video.c,v 1.2 95/01/05 20:42:24 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsdi/bsdi_video.c,v 3.0 1994/10/29 22:40:34 dawes Exp $ */
/*
* Copyright 1992 by Rich Murphey <Rich@Rice.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
index b15a59cec..784618526 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:28:45 dpw Exp $
#include <Server.tmpl>
SRCS = lnx_init.c lnx_video.c IO_utils.c lnx_io.c bios_devmem.c mapVT_noop.c \
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
index 25066e83f..b0bc57821 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: lnx_init.c,v 1.1 94/10/05 13:41:46 kaleb Exp $ */
+/* $XConsortium: lnx_init.c,v 1.2 94/10/12 20:46:43 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.0 1994/09/23 10:24:43 dawes Exp $ */
/*
* Copyright 1992 by Orest Zborowski <obz@Kodak.com>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
index d9053115f..4275f07e2 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: lnx_io.c,v 1.1 94/03/28 21:28:56 dpw Exp kaleb $ */
+/* $XConsortium: lnx_io.c,v 1.2 95/06/14 15:19:17 kaleb Exp $ */
/*
* Copyright 1992 by Orest Zborowski <obz@Kodak.com>
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
index 7fdca726e..373bfcdfe 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: lnx_video.c,v 1.1 94/03/28 21:29:02 dpw Exp $ */
/*
* Copyright 1992 by Orest Zborowski <obz@Kodak.com>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile
index 10e23b90e..0ac430936 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:29:09 dpw Exp $
#include <Server.tmpl>
#if defined(OsfArchitecture)
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c b/xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c
index eb8aa7578..6c2ca51c1 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bios_mmap.c,v 1.1 94/10/05 13:42:09 kaleb Exp $ */
+/* $XConsortium: bios_mmap.c,v 1.2 94/10/12 20:47:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/bios_mmap.c,v 3.0 1994/06/05 05:58:08 dawes Exp $ */
/*
* Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c
index 4240cd575..2fb9c4658 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach_init.c,v 1.1 94/10/05 13:42:09 kaleb Exp $ */
+/* $XConsortium: mach_init.c,v 1.2 94/10/12 20:47:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/mach/mach_init.c,v 3.0 1994/09/23 10:25:01 dawes Exp $ */
/*
* Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c
index e57e849eb..77b05f6f2 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mach_io.c,v 1.1 94/03/28 21:29:27 dpw Exp kaleb $ */
+/* $XConsortium: mach_io.c,v 1.2 95/06/14 15:19:17 kaleb Exp $ */
/*
* Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_video.c b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_video.c
index dbc873858..9f3b4fec8 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/mach/mach_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mach_video.c,v 1.1 94/03/28 21:29:32 dpw Exp $ */
/*
* Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile
index 3dfb959e5..9a5959fc7 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:42:17 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:47:58 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/Imakefile,v 3.0 1994/05/08 05:23:44 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c b/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c
index e33acc912..4f9caea8b 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mnx_init.c,v 1.1 94/10/05 13:42:17 kaleb Exp $ */
+/* $XConsortium: mnx_init.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_init.c,v 3.1 1994/09/23 10:25:09 dawes Exp $ */
/*
* Copyright 1993 by Vrije Universiteit, The Netherlands
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c b/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c
index cf1c1b5c7..287647245 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mnx_io.c,v 1.3 95/06/09 20:57:00 gildea Exp kaleb $ */
+/* $XConsortium: mnx_io.c,v 1.4 95/06/14 15:20:35 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_io.c,v 3.0 1994/05/08 05:23:49 dawes Exp $ */
/*
* Copyright 1993 by Vrije Universiteit, The Netherlands
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c b/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c
index 63404da0c..706df26bd 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mnx_video.c,v 1.1 94/10/05 13:42:17 kaleb Exp $ */
+/* $XConsortium: mnx_video.c,v 1.2 94/10/12 20:47:58 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/minix/mnx_video.c,v 3.0 1994/05/08 05:23:51 dawes Exp $ */
/*
* Copyright 1993 by Vrije Universiteit, The Netherlands
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile
index e6c51aea0..fdaef3c64 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/misc/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:30:02 dpw Exp $
#include <Server.tmpl>
SRCS = xf86_Util.c xf86_IlHack.c
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c b/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c
index a3b019131..68c8ec791 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_IlHack.c,v 1.1 94/10/05 13:42:25 kaleb Exp $ */
+/* $XConsortium: xf86_IlHack.c,v 1.2 94/10/12 20:48:48 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.0 1994/07/24 11:51:47 dawes Exp $ */
/*
* This file is an incredible crock to get the normally-inline functions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c b/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c
index 681ed1de1..c70d2cda0 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: xf86_Util.c,v 1.1 94/03/28 21:30:15 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile
index 394bd2b39..62a3c914f 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:30:21 dpw Exp $
#include <Server.tmpl>
SRCS = sco_init.c sco_video.c sco_io.c bios_devmem.c mapVT_noop.c VTsw_sco.c \
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c b/xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c
index 668ecdbba..1f9cc9335 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: VTsw_sco.c,v 1.1 94/03/28 21:30:26 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
* Copyright 1993 by David McCullough <davidm@stallion.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c
index 7a16d9d3e..01b51fd8d 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sco_init.c,v 1.2 94/10/12 20:49:22 kaleb Exp kaleb $ */
+/* $XConsortium: sco_init.c,v 1.3 95/01/05 20:42:39 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.2 1994/11/19 13:56:23 dawes Exp $ */
/*
* Copyright 1993 by David McCullough <davidm@stallion.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c
index 97238e9ac..db8baaa6a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: sco_io.c,v 1.1 94/03/28 21:30:38 dpw Exp $ */
/*
* Copyright 1993 by David McCullough <davidm@stallion.oz.au>
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c
index bc69478e2..64f8a8fad 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sco_mouse.c,v 1.1 94/10/05 13:42:34 kaleb Exp $ */
+/* $XConsortium: sco_mouse.c,v 1.2 94/10/12 20:49:22 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.1 1994/09/23 10:25:16 dawes Exp $ */
/******************************************************************************/
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c
index 88136e2dd..92ba344bf 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: sco_video.c,v 1.1 94/03/28 21:30:50 dpw Exp $ */
/*
* Copyright 1993 by David McCullough <davidm@stallion.oz.au>
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/IO_utils.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/IO_utils.c
index 9aa8c9a09..6e4b7dcac 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/IO_utils.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/IO_utils.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: IO_utils.c,v 1.1 94/03/28 21:30:58 dpw Exp $ */
/*
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c
index 4b71ed172..9b29d136a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: VTsw_noop.c,v 1.1 94/03/28 21:31:04 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c
index e931421a3..c8acffb7a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: VTsw_usl.c,v 1.1 94/03/28 21:31:11 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c
index a3ab3ae9f..8ade30d66 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: bios_devmem.c,v 1.1 94/03/28 21:31:17 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s b/xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s
index f34273fea..29de7be16 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s
@@ -1,4 +1,4 @@
-/* $XConsortium: inout.s,v 1.1 94/10/05 13:42:45 kaleb Exp $ */
+/* $XConsortium: inout.s,v 1.3 94/10/12 20:50:05 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/inout.s,v 3.0 1994/08/31 04:40:50 dawes Exp $ */
#include "assyntax.h"
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c
index aac234f15..b9993d629 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ioperm_noop.c,v 1.1 94/03/28 21:31:29 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c
index 6f7caee44..6119019ac 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/mapVT_noop.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: mapVT_noop.c,v 1.1 94/03/28 21:31:36 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c
index a7eb0efc0..0d9ecf0e7 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c
@@ -1,4 +1,4 @@
-/* $XConsortium: posix_tty.c,v 1.2 94/10/12 20:50:05 kaleb Exp kaleb $ */
+/* $XConsortium: posix_tty.c,v 1.3 95/01/05 20:42:55 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.2 1994/10/23 13:00:05 dawes Exp $ */
/*
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c
index cd4991cfb..90d7e1e3b 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: std_kbdEv.c,v 1.1 94/03/28 21:31:49 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c
index 0c655ede8..572273d8a 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: std_mouse.c,v 1.1 94/10/05 13:42:45 kaleb Exp $ */
+/* $XConsortium: std_mouse.c,v 1.2 94/10/12 20:50:05 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_mouse.c,v 3.1 1994/09/27 10:30:59 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mseEv.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mseEv.c
index e20141959..bfdf42907 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mseEv.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/std_mseEv.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: std_mseEv.c,v 1.1 94/03/28 21:32:02 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c
index 44212fa64..846eba8d6 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: sysv_kbd.c,v 1.1 94/03/28 21:32:08 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c b/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c
index af7653bbd..0253c03ab 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sysv_tty.c,v 1.2 94/10/12 20:50:05 kaleb Exp kaleb $ */
+/* $XConsortium: sysv_tty.c,v 1.3 95/01/05 22:40:58 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_tty.c,v 3.2 1994/10/23 13:00:06 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile
index 1e1f81592..a5420f876 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:43:13 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:50:38 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/Imakefile,v 3.0 1994/06/28 12:58:36 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c
index 3aa194b6b..b841173d3 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: solx86_init.c,v 1.1 94/10/05 13:43:13 kaleb Exp $ */
+/* $XConsortium: solx86_init.c,v 1.2 94/10/12 20:50:38 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_init.c,v 3.0 1994/09/23 10:25:22 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_iout.s b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_iout.s
index 818786ddc..e05457798 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_iout.s
+++ b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_iout.s
@@ -1,4 +1,4 @@
-/ $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $
+/ $XConsortium: solx86_iout.s,v 1.2 94/03/29 10:37:22 dpw Exp $
/
/ File: solx86_iout.s
/
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_mmap.c b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_mmap.c
index b956c6b00..cbedbaa34 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_mmap.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_mmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: solx86_mmap.c,v 1.1 94/03/28 21:32:38 dpw Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c
index 573cfd72b..a982628f2 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c
@@ -1,4 +1,4 @@
-/* $XConsortium: solx86_vid.c,v 1.1 94/10/05 13:43:13 kaleb Exp $ */
+/* $XConsortium: solx86_vid.c,v 1.2 94/10/12 20:50:38 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/solx86/solx86_vid.c,v 3.0 1994/06/28 12:30:25 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile
index 2fba4b65a..333e3e116 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:17 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.4 95/01/13 19:51:13 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/Imakefile,v 3.1 11994/12/10 03:03:43 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c b/xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c
index 10b355961..f29fc7297 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bios_V4mmap.c,v 1.1 94/03/28 21:32:56 dpw Exp kaleb $ */
+/* $XConsortium: bios_V4mmap.c,v 1.2 95/01/05 20:43:10 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/bios_V4mmap.c,v 3.0 1994/10/23 13:00:18 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c b/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c
index 23bd6be37..5e3a446e5 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sysv_init.c,v 1.1 94/10/05 13:43:21 kaleb Exp $ */
+/* $XConsortium: sysv_init.c,v 1.2 94/10/12 20:51:15 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.0 1994/09/23 10:25:28 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c b/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c
index ac6d23c57..de5da1a83 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: sysv_io.c,v 1.1 94/03/28 21:33:09 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Dawes <dawes@physics.su.oz.au>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c b/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c
index 1c8fb3203..f90d195f8 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sysv_video.c,v 1.1 94/03/28 21:33:15 dpw Exp Kaleb $ */
+/* $XConsortium: sysv_video.c,v 1.2 95/03/01 16:11:01 kaleb Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c b/xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c
index e658bedcf..564c5c2d0 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c
+++ b/xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: xqueue.c,v 1.1 94/03/28 21:33:22 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
*
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h b/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
index 5e8d6baea..2f7e614bc 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86_OSlib.h,v 1.6 95/01/06 20:58:14 kaleb Exp kaleb $ */
+/* $XConsortium: xf86_OSlib.h,v 1.7 95/01/16 13:17:55 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.12 1995/01/10 10:27:30 dawes Exp $ */
/*
* Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/Imakefile
index 4c4154de4..68e41f543 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:44:47 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:52:15 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/Imakefile,v 3.0 1994/06/05 05:58:22 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/confvga16.sh b/xc/programs/Xserver/hw/xfree86/vga16/confvga16.sh
index cf35fb93a..61a177bcf 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/confvga16.sh
+++ b/xc/programs/Xserver/hw/xfree86/vga16/confvga16.sh
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: confvga16.sh,v 1.1 94/03/28 21:33:40 dpw Exp $
#!/bin/sh
#
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile
index 72e12e3f7..f8d0755e2 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:53:13 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:18 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile,v 3.3 1994/12/25 12:32:34 dawes Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile
index 85fcfd4c7..6c6691e08 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:35:25 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/cl64xx/Imakefile,v 3.0 1994/12/17 10:07:15 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile
index 8361207a1..3a18ee761 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:55:42 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:44:03 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/et4000/Imakefile,v 3.1 1994/11/19 07:56:22 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile
index 092c621cb..e61c3482b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:45:26 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:56:14 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile,v 3.1 1994/05/30 08:25:30 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile
index 79f81f000..0488a35ba 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:45:32 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:56:52 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/ncr77c22/Imakefile,v 3.0 1994/05/30 08:25:35 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile
index f8cc79e1c..e80d59802 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:45:40 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 20:57:24 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/drivers/tvga8900/Imakefile,v 3.0 1994/05/30 08:25:47 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile
index a54b506d0..fd572b3e4 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:06:18 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/26 15:37:31 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/Imakefile,v 3.1 1995/01/26 02:20:15 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h
index 55bb8599b..b6f9f0a0f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h
@@ -1,4 +1,4 @@
-/* $XConsortium: OScompiler.h,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: OScompiler.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/OScompiler.h,v 3.1 1994/07/24 12:23:35 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c
index 3cbc93672..9567ab316 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: emulOpStip.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: emulOpStip.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulOpStip.c,v 3.0 1994/05/04 15:03:04 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c
index d302284b8..26b240b91 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c
@@ -1,4 +1,4 @@
-/* $XConsortium: emulRepAre.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: emulRepAre.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulRepAre.c,v 3.0 1994/05/04 15:03:05 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c
index dc827c7c2..cd8d7c013 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: emulStip.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: emulStip.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulStip.c,v 3.0 1994/05/04 15:03:06 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c
index d56a375b0..e4b5fe073 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c
@@ -1,4 +1,4 @@
-/* $XConsortium: emulTile.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: emulTile.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/emulTile.c,v 3.1 1994/05/31 08:12:21 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ibmTrace.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ibmTrace.h
index 6fb0d6cf3..a335c6096 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ibmTrace.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ibmTrace.h
@@ -1,3 +1,3 @@
-/* $XConsortium$ */
+/* $XConsortium: ibmTrace.h,v 1.1 94/03/28 21:34:53 dpw Exp $ */
#define TRACE(x) /* empty */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbfillarc.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbfillarc.c
index 624f02fe7..793abe798 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbfillarc.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbfillarc.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
/* GJA -- Took mfb code and modified it. */
-/* $XConsortium: mfbfillarc.c,v 5.7 94/03/28 21:34:59 dpw Exp $ */
+/* $XConsortium: mfbfillarc.c,v 5.8 94/04/17 20:31:44 dpw Exp $ */
#define BANKING_MODS
#include "X.h"
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbimggblt.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbimggblt.c
index c2b7e0175..8661b6792 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbimggblt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbimggblt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mfbimggblt.c,v 1.2 94/04/17 20:31:44 dpw Exp kaleb $ */
+/* $XConsortium: mfbimggblt.c,v 1.3 95/06/19 20:15:01 kaleb Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbzerarc.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbzerarc.c
index c775fcbbf..f6414b3c7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbzerarc.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/mfbzerarc.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
/* GJA -- Took mfb code and modified it. */
-/* $XConsortium: mfbzerarc.c,v 5.10 94/03/28 21:35:13 dpw Exp $ */
+/* $XConsortium: mfbzerarc.c,v 5.11 94/04/17 20:31:45 dpw Exp $ */
/* Derived from:
* "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c
index abec47dc3..2efb4c3f3 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c
@@ -1,4 +1,4 @@
-/* $XConsortium: offscreen.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: offscreen.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/offscreen.c,v 3.1 1994/06/18 16:26:33 dawes Exp $ */
/*
* Copyright 1993 Gerrit Jan Akkerman
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppc.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppc.h
index 41ded7227..57fa42b99 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppc.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppc.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppc.h,v 1.1 94/03/28 21:35:27 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArc.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArc.c
index d8a435587..2c6a698d0 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArc.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArc.c
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcArc.c,v 1.1 94/03/28 21:35:33 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c
index 669ea0305..ff1e9e858 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcArea.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcArea.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcArea.c,v 3.0 1994/05/04 15:03:16 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c
index 365a9ed6a..6181e990d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcBStore.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcBStore.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBStore.c,v 3.1 1994/06/18 16:26:35 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitMacs.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitMacs.h
index 02ee849fd..74399b078 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitMacs.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitMacs.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcBitMacs.h,v 1.1 94/03/28 21:35:52 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c
index 8d7dc817b..e2c692fbb 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcBitmap.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcBitmap.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcBitmap.c,v 3.0 1994/05/04 15:03:19 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCReduce.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCReduce.c
index d8d11c2a7..b7e3b8934 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCReduce.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCReduce.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcCReduce.c,v 1.1 94/03/28 21:36:04 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcClip.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcClip.c
index 31fcd6c67..e698ff82e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcClip.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcClip.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcClip.c,v 1.1 94/03/28 21:36:10 dpw Exp $ */
+/* $XConsortium: ppcClip.c,v 1.2 94/04/17 20:31:47 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c
index d262881ef..db9ab64ea 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcCpArea.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcCpArea.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCpArea.c,v 3.1 1994/06/18 16:26:37 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCurs.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCurs.c
index f7207eec8..a6ea3c589 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCurs.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcCurs.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcCurs.c,v 1.1 94/03/28 21:36:22 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcDepth.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcDepth.c
index 27473c209..175a1d0a3 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcDepth.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcDepth.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcDepth.c,v 1.1 94/03/28 21:36:27 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcFillRct.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcFillRct.c
index b8c58cc29..cf5e281e7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcFillRct.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcFillRct.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcFillRct.c,v 1.2 94/04/17 20:31:48 dpw Exp kaleb $ */
+/* $XConsortium: ppcFillRct.c,v 1.3 95/06/19 20:15:26 kaleb Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c
index 8b898f5bf..b1e917a66 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcGC.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcGC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGC.c,v 3.0 1994/05/04 15:03:22 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGCstr.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGCstr.h
index 6d4660da2..18fb5369e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGCstr.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGCstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcGCstr.h,v 1.1 94/03/28 21:36:45 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c
index 766ab6c66..c6628e60e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcGetSp.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcGetSp.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcGetSp.c,v 3.0 1994/05/04 15:03:24 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c
index e5ee42e29..46da65764 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcIO.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcIO.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcIO.c,v 3.0 1994/05/04 15:03:25 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c
index 09187a308..84e7a7bd5 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcImg.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcImg.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcImg.c,v 3.1 1994/05/31 08:12:22 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c
index 2668c28fc..4434fc193 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcPixmapFS.c,v 1.2 94/04/17 20:31:53 dpw Exp $ */
+/* $XConsortium: ppcPixFS.c,v 1.1 95/01/26 15:21:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixFS.c,v 3.0 1994/05/04 15:03:29 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixmap.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixmap.c
index 0aa776fb0..293e7ef00 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixmap.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPixmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcPixmap.c,v 1.1 94/03/28 21:37:09 dpw Exp $ */
+/* $XConsortium: ppcPixmap.c,v 1.2 94/04/17 20:31:53 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c
index 800ede041..f936e0e15 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcPntWin.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcPntWin.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPntWin.c,v 3.0 1994/05/04 15:03:30 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c
index 29c891cb0..911465ee9 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcPolyPnt.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcPolyPnt.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyPnt.c,v 3.0 1994/05/04 15:03:32 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyRec.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyRec.c
index da944c3ef..848a7f8c9 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyRec.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPolyRec.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcPolyRec.c,v 1.1 94/03/28 21:37:34 dpw Exp $ */
+/* $XConsortium: ppcPolyRec.c,v 1.2 94/04/17 20:31:55 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcProcs.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcProcs.h
index d8a435587..f7b12df56 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcProcs.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcProcs.h
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcProcs.h,v 1.1 94/03/28 21:37:40 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c
index 735001dfd..357624738 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcPushPxl.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcPushPxl.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcPushPxl.c,v 3.0 1994/05/04 15:03:34 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcQuery.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcQuery.c
index 054b67f0b..2b89779bd 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcQuery.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcQuery.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcQuery.c,v 1.1 94/03/28 21:37:52 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRot.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRot.c
index b9b92075e..23a9f8c1c 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRot.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRot.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcRot.c,v 1.1 94/03/28 21:37:58 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c
index 227e9db7c..ffe0629b7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcRslvC.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcRslvC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcRslvC.c,v 3.0 1994/05/04 15:03:35 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcScrn.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcScrn.h
index 0c422170c..dd0267bb2 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcScrn.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcScrn.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcScrn.h,v 1.1 94/03/28 21:38:11 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c
index ccbaee4d1..cc7677d62 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcSetSp.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcSetSp.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSetSp.c,v 3.1 1994/06/18 16:26:39 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSinTab.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSinTab.c
index d8a435587..9eabe7eb1 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSinTab.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSinTab.c
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcSinTab.c,v 1.1 94/03/28 21:38:23 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSpMcro.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSpMcro.h
index 2c76eb117..0eb2b432d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSpMcro.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcSpMcro.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: ppcSpMcro.h,v 1.1 94/03/28 21:38:30 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c
index bcc5e7712..981bb1983 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcWindowFS.c,v 1.2 94/04/17 20:31:58 dpw Exp $ */
+/* $XConsortium: ppcWinFS.c,v 1.1 95/01/26 15:21:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWinFS.c,v 3.0 1994/05/04 15:03:40 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c
index 2086fb596..f13b36954 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ppcWindow.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: ppcWindow.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/ppcWindow.c,v 3.0 1994/05/04 15:03:39 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h
index e0bc063e1..3e73b292f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vga16.h,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vga16.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vga16.h,v 3.1 1994/06/18 16:26:41 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c
index 6860e751e..dda05d9af 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaBitBlt.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vgaBitBlt.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaBitBlt.c,v 3.0 1994/05/04 15:03:44 dawes Exp $ */
/* GJA -- span move routines */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaData.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaData.c
index d8a435587..e46b3c133 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaData.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaData.c
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: vgaData.c,v 1.1 94/03/28 21:39:08 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c
index 8e7d00bbe..05f570f37 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaGC.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vgaGC.c,v 1.3 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaGC.c,v 3.0 1994/05/04 15:03:46 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaIO.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaIO.c
index d8a435587..221d7445e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaIO.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaIO.c
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: vgaIO.c,v 1.1 94/03/28 21:39:20 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c
index edfd2c49b..d00d76abb 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaImages.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vgaImages.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaImages.c,v 3.0 1994/05/04 15:03:47 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaOSD.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaOSD.c
index d8a435587..b13bcdfde 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaOSD.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaOSD.c
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: vgaOSD.c,v 1.1 94/03/28 21:39:38 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaProcs.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaProcs.h
index d8a435587..e61c29a77 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaProcs.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaProcs.h
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: vgaProcs.h,v 1.1 94/03/28 21:39:44 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaReg.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaReg.h
index e6da11252..d7218051f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaReg.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaReg.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: vgaReg.h,v 1.1 94/03/28 21:39:50 dpw Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSave.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSave.h
index d8a435587..1194eae53 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSave.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSave.h
@@ -1 +1 @@
-/* $XConsortium$ */
+/* $XConsortium: vgaSave.h,v 1.1 94/03/28 21:39:56 dpw Exp $ */
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c
index 97bb976bd..d5124b6dd 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaSolid.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vgaSolid.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaSolid.c,v 3.0 1994/05/04 15:03:49 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c
index 79ef9b6c6..af1c23343 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaStipple.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vgaStipple.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaStipple.c,v 3.0 1994/05/04 15:03:51 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h
index 7b1a6d679..bbe399b0d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaVideo.h,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: vgaVideo.h,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/vgaVideo.h,v 3.0 1994/05/04 15:03:52 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm0.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm0.h
index c24878feb..734ae5a8b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm0.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm0.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: wm0.h,v 1.1 94/03/28 21:40:20 dpw Exp $ */
#include "vgaReg.h"
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c b/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c
index b8b3e3e07..b3279139f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c
@@ -1,4 +1,4 @@
-/* $XConsortium: wm3.c,v 1.1 94/10/05 13:45:56 kaleb Exp $ */
+/* $XConsortium: wm3.c,v 1.2 94/10/12 21:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.c,v 3.0 1994/05/04 15:03:54 dawes Exp $ */
#include <sys/types.h>
#include "compiler.h"
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.h b/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.h
index 524f2954b..08cd2f889 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.h
+++ b/xc/programs/Xserver/hw/xfree86/vga16/ibm/wm3.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: wm3.h,v 1.1 94/03/28 21:40:31 dpw Exp $ */
#include "vgaReg.h"
/* Do call in Write Mode 3.
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile
index 4c37c78cc..d81e632ba 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:08:02 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:19 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile,v 3.2 1994/12/17 10:07:36 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/mi/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/mi/Imakefile
index d769eac3c..abba86f1b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/mi/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/mi/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:40:49 dpw Exp $
#include <Server.tmpl>
SRCS = mibitblt16.c mipushpx16.c
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile
index 4ce15801f..8a586940e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:09:16 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:20 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/misc/Imakefile,v 3.2 1994/12/26 01:09:31 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile b/xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile
index d17d8df9e..b79c0e11e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:46:56 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:09:48 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/vga/Imakefile,v 3.0 1994/05/04 15:04:22 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/Imakefile
index 811bd23b6..9543adc5e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:47:12 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:13:49 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/Imakefile,v 3.1 1994/06/05 05:59:28 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/configvga2.sh b/xc/programs/Xserver/hw/xfree86/vga2/configvga2.sh
index 5043e582f..72cf373fb 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/configvga2.sh
+++ b/xc/programs/Xserver/hw/xfree86/vga2/configvga2.sh
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: configvga2.sh,v 1.1 94/03/28 21:41:14 dpw Exp $
#!/bin/sh
#
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile
index 0f5308ab9..c125fa611 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:14:28 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:21 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile,v 3.3 1994/12/25 12:33:27 dawes Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile
index 1976dffb3..89c9817a8 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:34:52 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/cl64xx/Imakefile,v 3.0 1994/12/17 10:07:48 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile
index a78b74279..57f891f82 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:48:37 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:15:39 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/compaq/Imakefile,v 3.0 1994/05/30 08:26:28 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile
index 78246a1cd..a87527358 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:48:42 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:16:10 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/et3000/Imakefile,v 3.0 1994/05/30 08:26:38 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile
index 36e4be325..956df2775 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:16:35 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:45:04 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/et4000/Imakefile,v 3.1 1994/11/19 07:57:24 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile
index e67bf97b9..18c0a4b3f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:48:57 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:17:22 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/Imakefile,v 3.1 1994/05/15 03:01:52 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c b/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c
index 6269c713c..8e589e8d2 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: gen_driver.c,v 1.2 94/10/12 21:17:22 kaleb Exp kaleb $ */
+/* $XConsortium: gen_driver.c,v 1.3 95/01/16 13:17:59 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/generic/gen_driver.c,v 3.6 1995/01/10 10:29:23 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile
index 42a2eaf8c..d692f194d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:49:06 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:19 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/gvga/Imakefile,v 3.0 1994/05/30 08:26:46 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile
index b4a076d0a..cf574f0bc 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:49:11 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:39 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/ncr77c22/Imakefile,v 3.0 1994/05/30 08:26:50 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile
index c9e842ddb..b5821a7e7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:49:16 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:18:55 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/oak/Imakefile,v 3.0 1994/05/30 08:26:53 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile
index 15732a17f..d1c3f20c7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:49:22 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:19:15 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/pvga1/Imakefile,v 3.1 1994/07/24 11:55:07 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile
index 1bc5a461a..0dc3519c8 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:49:26 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:19:32 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/drivers/tvga8900/Imakefile,v 3.0 1994/05/30 08:27:01 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile
index 30aba8d74..0b7717431 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:20:46 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:22 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/Imakefile,v 3.1 1994/12/17 10:08:05 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c b/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c
index fb076ac70..7ce492958 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbbitblt.c,v 1.1 94/10/05 13:47:43 kaleb Exp $ */
+/* $XConsortium: mfbbitblt.c,v 1.3 94/10/12 21:20:46 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb.banked/mfbbitblt.c,v 3.0 1994/05/31 08:13:32 dawes Exp $ */
#include "X.h"
#include "Xprotostr.h"
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile
index 3831d51fd..99a93e289 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:47:28 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:20:01 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile,v 3.1 1994/05/14 07:01:05 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile
index dc5186abf..41b672b63 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:22:51 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:23 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/misc/Imakefile,v 3.2 1994/12/26 01:10:43 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile b/xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile
index 7a3276ea4..f84a15fea 100644
--- a/xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:48:03 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:23:24 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/vga/Imakefile,v 3.1 1994/05/31 13:10:02 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/Imakefile
index 01dc5fa0c..ced6ef839 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:49:49 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/12 21:30:32 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/Imakefile,v 3.4 1994/09/25 12:30:27 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/confvga256.sh b/xc/programs/Xserver/hw/xfree86/vga256/confvga256.sh
index 9c29f43c8..5669e7cc5 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/confvga256.sh
+++ b/xc/programs/Xserver/hw/xfree86/vga256/confvga256.sh
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: confvga256.sh,v 1.1 94/03/28 21:43:21 dpw Exp $
#!/bin/sh
#
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile
index a5a58b5c4..0b539e4e5 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:50:11 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:58:24 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile,v 3.4 1994/12/25 12:34:25 dawes Exp $
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile
index dc5ce63ce..d27be4ef4 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.1 94/12/15 21:06:48 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/Imakefile,v 3.0 1994/10/30 04:21:37 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s
index 16f5cc8fc..906631b15 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: ali_bank.s,v 1.1 94/12/15 21:06:48 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_bank.s,v 3.0 1994/10/30 04:21:45 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c
index 98398d87e..c4af5be28 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ali_driver.c,v 1.3 95/01/13 20:02:21 kaleb Exp kaleb $
+ * $XConsortium: ali_driver.c,v 1.4 95/01/16 13:18:01 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ali/ali_driver.c,v 3.3 1995/01/10 10:30:21 dawes Exp $
*/
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile
index 231608f6f..14bacab3f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:20:10 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:46:05 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/Imakefile,v 3.2 1994/11/30 20:43:54 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/ati_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/ati_driver.c
index 5f5f52af9..b970d77c2 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/ati_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/ati_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: ati_driver.c,v 1.7 95/06/19 18:59:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/ati_driver.c,v 3.19 1995/01/22 03:07:34 dawes Exp $ */
/*
* Copyright 1994 and 1995 by Marc Aurele La France (TSI @ UQV), tsi@ualberta.ca
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/bank.s
index f7a621358..a572b33f1 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: bank.s,v 1.5 95/06/19 18:59:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ati/bank.s,v 3.2 1994/10/29 22:45:42 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile
index bbc7eab02..52a90266f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.1 94/12/15 21:08:14 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/Imakefile,v 3.0 1994/11/05 23:51:50 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s
index 33d4437d1..936813ed6 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: ct_bank.s,v 1.1 94/12/15 21:08:14 kaleb Exp kaleb $ */
+/* $XConsortium: ct_bank.s,v 1.2 95/01/06 20:58:29 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_bank.s,v 3.1 1995/01/04 04:42:01 dawes Exp $ */
/*
* Copyright 1994 by Régis Cridlig <cridlig@dmi.ens.fr>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c
index 2dafeffe6..e335e44b3 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ct_driver.c,v 1.3 95/01/16 13:18:05 kaleb Exp kaleb $ */
+/* $XConsortium: ct_driver.c,v 1.4 95/01/23 15:35:08 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/chips/ct_driver.c,v 3.7 1995/01/20 04:22:37 dawes Exp $ */
/*
* Copyright 1993 by Jon Block <block@frc.com>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile
index 27fda9a22..12be13dbd 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 95/01/06 20:58:33 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.5 95/01/26 15:38:28 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/Imakefile,v 3.8 1995/01/26 02:20:53 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h
index b009db86d..acef37d66 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: cirBlitMM.h,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitMM.h,v 3.3 1994/12/25 12:34:47 dawes Exp $ */
/* Definitions for BitBLT engine communication. */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h
index db406b685..4a93d193b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_blitter.h,v 1.1 94/03/28 21:48:17 dpw Exp $ */
+/* $XConsortium: cirBlitter.h,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirBlitter.h,v 3.6 1995/01/04 04:42:18 dawes Exp $ */
/* Definitions for BitBLT engine communication. */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c
index 78148cc24..b58b945c9 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c
@@ -28,7 +28,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
*/
-/* $XConsortium: cir_fillrct.c,v 5.14 94/04/17 20:32:33 dpw Exp $ */
+/* $XConsortium: cirFillRct.c,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillRct.c,v 3.5 1994/12/25 12:35:02 dawes Exp $ */
/* Modified for Cirrus by Harm Hanemaayer, <hhanemaa@cs.ruu.nl> */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c
index 5c5535a4e..303bd9d5e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_fillst.c,v 1.1 94/03/28 21:49:18 dpw Exp $ */
+/* $XConsortium: cirFillSt.c,v 1.1 95/01/26 15:08:31 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cirFillSt.c,v 3.7 1995/01/04 04:42:26 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bank.s
index dc1a6ac86..1de8a4df8 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: cir_bank.s,v 1.2 94/03/29 11:07:35 dpw Exp $ */
/*
* Header: /usr/local/src/Xaccel/cirrus/RCS/bank.s,v 1.2 1993/04/04 17:56:11 bill Exp
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c
index 79b025002..923008cce 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_blitter.c,v 1.3 95/01/06 20:58:35 kaleb Exp kaleb $ */
+/* $XConsortium: cir_blitter.c,v 1.4 95/01/26 15:38:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blitter.c,v 3.7 1995/01/26 02:20:56 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c
index 579ca8083..17a4ebf8b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_blt.c,v 1.1 94/10/05 13:52:22 kaleb Exp $ */
+/* $XConsortium: cir_blt.c,v 1.2 94/10/13 13:21:46 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt.c,v 3.1 1994/08/20 07:36:47 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c
index 73aaf0484..a61aa8580 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c
@@ -2,7 +2,7 @@
* Hooks for cfb16/32 CopyArea and CopyWindow
*/
-/* $XConsortium: $ */
+/* $XConsortium: cir_blt16.c,v 1.2 95/01/27 14:47:22 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_blt16.c,v 3.0 1994/10/30 04:22:33 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c
index 05b8232f3..75c8e601d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_bltC.c,v 1.4 95/01/05 20:47:57 kaleb Exp kaleb $ */
+/* $XConsortium: cir_bltC.c,v 1.5 95/01/23 15:35:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_bltC.c,v 3.6 1995/01/18 06:14:32 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c
index 3ca66bc60..a5cd1728b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_colexp.c,v 1.2 94/10/13 13:21:46 kaleb Exp kaleb $ */
+/* $XConsortium: cir_colexp.c,v 1.3 95/01/05 20:47:57 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_colexp.c,v 3.5 1994/10/20 06:11:18 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c
index a560bf23e..dd37cafa7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_driver.c,v 1.5 95/01/16 13:18:07 kaleb Exp kaleb $ */
+/* $XConsortium: cir_driver.c,v 1.6 95/01/23 15:35:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.c,v 3.31 1995/01/21 07:18:04 dawes Exp $ */
/*
* cir_driver.c,v 1.10 1994/09/14 13:59:50 scooper Exp
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h
index 83dcd75c2..1e8a295e7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_driver.h,v 1.4 95/01/06 20:58:40 kaleb Exp kaleb $ */
+/* $XConsortium: cir_driver.h,v 1.5 95/01/23 15:35:14 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_driver.h,v 3.13 1995/01/18 06:14:40 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c
index bb7c33a8d..672e934bd 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_fill.c,v 1.2 94/10/13 13:21:46 kaleb Exp kaleb $ */
+/* $XConsortium: cir_fill.c,v 1.3 95/01/05 20:48:33 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_fill.c,v 3.6 1994/12/02 05:48:16 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c
index 0d17e4d40..1b3552b74 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_im.c,v 1.3 95/01/06 20:58:42 kaleb Exp kaleb $ */
+/* $XConsortium: cir_im.c,v 1.4 95/01/26 15:38:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_im.c,v 3.7 1995/01/26 02:20:59 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s
index 27eb8fc50..f07418f3d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_imblt.s,v 1.3 94/10/13 13:21:46 kaleb Exp kaleb $ */
+/* $XConsortium: cir_imblt.s,v 1.4 95/01/23 15:35:15 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_imblt.s,v 3.4 1995/01/21 07:18:08 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h
index a6991cba7..0b0a48d87 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_inline.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: cir_inline.h,v 1.1 94/03/28 21:49:47 dpw Exp $ */
/* Some inline assembler functions. */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c
index 2504a77b1..b43ec6888 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cir_line.c,v 1.2 95/01/10 17:00:19 kaleb Exp kaleb $ */
+/* $XConsortium: cir_line.c,v 1.3 95/01/26 15:38:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_line.c,v 3.0 1994/12/25 12:35:06 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c
index abbbb863f..f88d09b2a 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_orect.c,v 1.2 95/01/16 13:18:09 kaleb Exp kaleb $ */
+/* $XConsortium: cir_orect.c,v 1.3 95/01/26 15:38:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_orect.c,v 3.3 1995/01/26 02:21:02 dawes Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c
index 6d7fba444..2ccbf4468 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_solid.c,v 1.1 95/01/06 20:37:49 kaleb Exp kaleb $ */
+/* $XConsortium: cir_solid.c,v 1.2 95/01/26 15:38:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_solid.c,v 3.2 1995/01/26 02:21:03 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c
index 4b5563334..005e3d3f8 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_teblt8.c,v 1.6 95/01/23 15:35:16 kaleb Exp kaleb $ */
+/* $XConsortium: cir_teblt8.c,v 1.7 95/01/26 15:38:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_teblt8.c,v 3.13 1995/01/26 02:21:05 dawes Exp $ */
/*
* TEGblt - ImageText expanded glyph fonts only. For
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s
index 77839ee4e..cc2204222 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s
@@ -1,4 +1,4 @@
-/* $XConsortium: cir_textblt.s,v 1.3 94/10/13 13:21:46 kaleb Exp kaleb $ */
+/* $XConsortium: cir_textblt.s,v 1.4 95/01/05 20:47:57 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/cir_textblt.s,v 3.4 1994/10/23 13:01:01 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c
index d8219bc1c..63adb78b6 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c
@@ -1,4 +1,4 @@
-/* $XConsortium: linearline.c,v 1.1 95/01/06 20:37:49 kaleb Exp kaleb $ */
+/* $XConsortium: linearline.c,v 1.2 95/01/16 13:18:10 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.c,v 3.2 1995/01/07 04:12:08 dawes Exp $ */
/*
* Copyright 1994 The XFree86 Project
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h
index 954805bf3..188584382 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: linearline.h,v 1.1 95/01/06 20:37:49 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cirrus/linearline.h,v 3.0 1994/12/25 12:35:15 dawes Exp $ */
/* linearline.c */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile
index c4db709ef..9a6d81776 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.1 95/01/06 20:34:08 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/Imakefile,v 3.0 1994/12/17 10:08:19 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s
index cd6c7a92d..536defe4d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: cl_bank.s,v 1.1 95/01/06 20:34:08 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_bank.s,v 3.0 1994/12/17 10:08:20 dawes Exp $ */
/*
* Stubs driver Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c
index 1bda2c11e..b68ed99fb 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cl_driver.c,v 1.1 95/01/06 20:34:08 kaleb Exp kaleb $ */
+/* $XConsortium: cl_driver.c,v 1.2 95/01/16 13:18:11 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/cl64xx/cl_driver.c,v 3.3 1995/01/12 08:52:46 dawes Exp $ */
/*
* Stubs driver Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile
index 23521eef8..1e7c79737 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:52:47 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:23:01 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/Imakefile,v 3.0 1994/05/30 08:27:29 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_bank.s
index 193812c74..1f41e978d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: cpq_bank.s,v 1.2 94/03/29 11:07:07 dpw Exp $ */
/*
* Copyright 1993 Hans Oey <hans@mo.hobby.nl>
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c
index e68d7f483..0a633ae86 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cpq_driver.c,v 1.3 95/01/06 20:58:48 kaleb Exp kaleb $ */
+/* $XConsortium: cpq_driver.c,v 1.4 95/01/16 13:18:12 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/compaq/cpq_driver.c,v 3.5 1995/01/10 10:31:10 dawes Exp $ */
/*
* Copyright 1993 Hans Oey <hans@mo.hobby.nl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile
index f0197d0f9..ab1026a1c 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:52:55 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:23:37 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/Imakefile,v 3.0 1994/05/30 08:27:33 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/bank.s
index a62d44d67..dd4a2c58a 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: bank.s,v 1.2 94/03/29 11:06:37 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c
index 9dec1a1c6..81f49fd50 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: et3_driver.c,v 1.3 95/01/06 20:58:49 kaleb Exp kaleb $ */
+/* $XConsortium: et3_driver.c,v 1.4 95/01/16 13:18:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et3000/et3_driver.c,v 3.5 1995/01/10 10:31:16 dawes Exp $ */
/*
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile
index c1bda5fcc..c16b2a233 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:24:00 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.3 95/01/05 20:49:40 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile,v 3.2 1994/11/19 07:58:22 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s
index 5041f1408..031733dd7 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: bank.s,v 1.3 94/10/13 13:24:00 kaleb Exp kaleb $ */
+/* $XConsortium: bank.s,v 1.4 95/01/16 13:18:13 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/bank.s,v 3.2 1995/01/10 10:31:23 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c
index fe8f57074..5ecfc20a1 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: et4_driver.c,v 1.5 95/01/06 20:58:50 kaleb Exp kaleb $
+ * $XConsortium: et4_driver.c,v 1.6 95/01/16 13:18:14 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/et4000/et4_driver.c,v 3.8 1995/01/10 10:31:24 dawes Exp $
*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile
index dff711432..f9ad84004 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:54:21 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:24:59 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/Imakefile,v 3.0 1994/05/30 08:27:40 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/bank.s
index d54a5cd3a..adeaee6e9 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: bank.s,v 1.2 94/03/29 11:05:36 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c
index f648536e1..c4658a450 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: gvg_driver.c,v 1.2 94/10/13 13:24:59 kaleb Exp kaleb $ */
+/* $XConsortium: gvg_driver.c,v 1.3 95/01/16 13:18:16 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/gvga/gvg_driver.c,v 3.4 1995/01/10 10:31:39 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile
index 9f4fd9b53..67605e6d1 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:54:34 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:25:18 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/Imakefile,v 3.0 1994/05/30 08:27:43 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_bank.s
index 03759f013..c71aa474c 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: ncr_bank.s,v 1.2 94/03/29 11:05:12 dpw Exp $ */
/*
* Copyright 1992,1993 NCR Corporation, Inc.
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c
index 16cd371a7..c6caa793e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ncr_driver.c,v 1.3 95/01/06 20:58:53 kaleb Exp kaleb $ */
+/* $XConsortium: ncr_driver.c,v 1.4 95/01/16 13:18:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/ncr77c22/ncr_driver.c,v 3.5 1995/01/10 10:31:54 dawes Exp $ */
/* Copyright 1992 NCR Corporation - Dayton, Ohio, USA */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile
index ae9d9e278..cf503d305 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:54:40 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:25:59 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/Imakefile,v 3.1 1994/09/22 15:51:56 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s
index e0f0d7378..86172ee2d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: oak_bank.s,v 1.2 94/03/29 11:04:46 dpw Exp kaleb $ */
+/* $XConsortium: oak_bank.s,v 1.3 95/01/05 20:49:58 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_bank.s,v 3.0 1994/10/20 06:11:59 dawes Exp $ */
/*
* Copyright 1993 by David Wexelblat <dwex@goblin.org>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c
index 860279166..3701b6102 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: oak_driver.c,v 1.5 95/01/16 13:18:20 kaleb Exp kaleb $ */
+/* $XConsortium: oak_driver.c,v 1.6 95/01/23 15:35:17 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/oak/oak_driver.c,v 3.12 1995/01/21 07:18:44 dawes Exp $ */
/*
* Copyright 1994 by Jorge Delgado <ernar@dit.upm.es>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile
index fd2efd58c..b3719c9cc 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:54:47 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:26:38 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/Imakefile,v 3.4 1994/09/22 15:52:01 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s
index 92b91ff92..a1c6a4916 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: bank.s,v 1.1 94/10/05 13:54:47 kaleb Exp $ */
+/* $XConsortium: bank.s,v 1.3 94/10/13 13:26:38 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/bank.s,v 3.2 1994/08/01 12:18:11 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h
index 7447807fc..a544bd37b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h
@@ -1,4 +1,4 @@
-/* $XConsortium: paradise.h,v 1.1 94/10/05 13:54:47 kaleb Exp $ */
+/* $XConsortium: paradise.h,v 1.2 94/10/13 13:26:38 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/paradise.h,v 3.0 1994/07/24 11:57:00 dawes Exp $ */
/* Author: Mike Tierney <floyd@eng.umd.edu> */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c
index fe2060fac..a01b4def9 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: pvg_driver.c,v 1.4 95/01/06 20:58:56 kaleb Exp kaleb $
+ * $XConsortium: pvg_driver.c,v 1.5 95/01/16 13:18:21 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvg_driver.c,v 3.13 1995/01/14 10:48:56 dawes Exp $
*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c
index 863d6a010..0dda80824 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pvgaBitBlt.c,v 1.3 95/01/16 13:18:22 kaleb Exp kaleb $ */
+/* $XConsortium: pvgaBitBlt.c,v 1.4 95/01/23 15:35:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgaBitBlt.c,v 3.2 1995/01/18 11:00:12 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c
index 16ed18b89..f3e3d17dc 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pvgablt.c,v 1.5 95/01/16 13:18:23 kaleb Exp kaleb $ */
+/* $XConsortium: pvgablt.c,v 1.6 95/01/23 15:35:20 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgablt.c,v 3.2 1995/01/19 05:25:20 dawes Exp $ */
/*
* cfb copy area
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c
index 2e3f5e20a..7dcb44f91 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pvgapntwin.c,v 1.3 94/10/13 13:26:38 kaleb Exp kaleb $ */
+/* $XConsortium: pvgapntwin.c,v 1.4 95/01/16 13:18:24 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgapntwin.c,v 3.1 1995/01/14 10:49:03 dawes Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c
index 7c7147ce0..354ce9e22 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: pvgasolid.c,v 1.1 94/10/05 13:54:47 kaleb Exp $
+ * $XConsortium: pvgasolid.c,v 1.6 94/10/13 13:26:38 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/pvga1/pvgasolid.c,v 3.0 1994/07/24 11:57:07 dawes Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile
index 353b26ce4..281d74743 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/10/05 13:55:06 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/10/13 13:27:09 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/Imakefile,v 3.1 1994/05/30 11:32:38 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/bank.s b/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/bank.s
index 0b5872faa..daa5cb986 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/bank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/bank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: bank.s,v 1.2 94/03/29 11:03:31 dpw Exp $ */
/*
* Copyright 1992 by Alan Hourihane, Wigan, England.
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c b/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c
index 26fb8a374..80afe8437 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c
@@ -1,4 +1,4 @@
-/* $XConsortium: t89_driver.c,v 1.3 95/01/06 20:58:58 kaleb Exp kaleb $ */
+/* $XConsortium: t89_driver.c,v 1.4 95/01/16 13:18:25 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/tvga8900/t89_driver.c,v 3.6 1995/01/10 10:33:16 dawes Exp $ */
/*
* Copyright 1992 by Alan Hourihane, Wigan, England.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c
index f3a304161..f4f85dc5d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: SpeedUpBlt.c,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: SpeedUpBlt.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/SpeedUpBlt.c,v 3.0 1994/07/24 11:58:09 dawes Exp $ */
/*******************************************************************************
Copyr 1992 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fBitBlt.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fBitBlt.s
index d3ec191b1..5d7e3dad4 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fBitBlt.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fBitBlt.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: fBitBlt.s,v 1.2 94/03/29 11:18:59 dpw Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s
index 376e7d035..363e0f759 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s
@@ -1,4 +1,4 @@
-/* $XConsortium: fFill.s,v 1.3 94/10/13 13:16:19 kaleb Exp kaleb $ */
+/* $XConsortium: fFill.s,v 1.4 95/01/05 20:50:47 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFill.s,v 3.2 1994/10/21 11:24:24 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s
index 5f279c72a..a022f5a2b 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s
@@ -1,4 +1,4 @@
-/* $XConsortium: fFillSet.s,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: fFillSet.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fFillSet.s,v 3.1 1994/09/08 14:40:36 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s
index 56002ce58..e917a7cd3 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s
@@ -1,4 +1,4 @@
-/* $XConsortium: fLineBres.s,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: fLineBres.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineBres.s,v 3.3 1994/09/21 10:59:42 dawes Exp $ */
/* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s
index be73e474e..c422cfddb 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s
@@ -1,4 +1,4 @@
-/* $XConsortium: fLineH.s,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: fLineH.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineH.s,v 3.2 1994/09/21 10:59:43 dawes Exp $ */
/* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s
index 75622896c..2e99f59cf 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s
@@ -1,4 +1,4 @@
-/* $XConsortium: fLineV.s,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: fLineV.s,v 1.3 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/fLineV.s,v 3.2 1994/09/21 10:59:44 dawes Exp $ */
/* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c
index 77adfd97e..4cdd2bbe1 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c
@@ -1,4 +1,4 @@
-/* $XConsortium: gBanks.c,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: gBanks.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/gBanks.c,v 3.0 1994/07/24 11:58:14 dawes Exp $ */
/*******************************************************************************
Copyright 1992 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBBlt2.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBBlt2.s
index 6fe1792eb..fb3d0405f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBBlt2.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBBlt2.s
@@ -1,4 +1,4 @@
-/* $XConsortium: suBitBlt2.s,v 1.2 94/03/29 11:19:16 dpw Exp $ */
+/* $XConsortium: suBBlt2.s,v 1.1 95/01/26 15:07:11 kaleb Exp $ */
/*******************************************************************************
Copyright 1992 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBitBlt.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBitBlt.s
index 451436ed5..fac8b7c82 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBitBlt.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBitBlt.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: suBitBlt.s,v 1.2 94/03/29 11:19:15 dpw Exp $ */
/*******************************************************************************
Copyr 1992 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBox.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBox.s
index dca9fc485..bf6756731 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBox.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suBox.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: suBox.s,v 1.2 94/03/29 11:19:18 dpw Exp $ */
/*******************************************************************************
Copyright 1992 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suLine.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suLine.s
index cc86deef9..7f3f32888 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suLine.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suLine.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: suLine.s,v 1.2 94/03/29 11:19:20 dpw Exp $ */
/*******************************************************************************
Copyright 1992, 1993 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suVHLine.s b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suVHLine.s
index 5a2ff1443..769695f72 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suVHLine.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/suVHLine.s
@@ -1,4 +1,4 @@
-/* $XConsortium: mach8.c,v 1.1 94/03/28 21:09:56 dpw Exp $ */
+/* $XConsortium: suVHLine.s,v 1.2 94/03/29 11:19:22 dpw Exp $ */
/*******************************************************************************
Copyright 1992, 1993 by Glenn G. Lai
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c
index ff3c46637..791df3bea 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaBitBlt.c,v 1.1 94/10/05 13:50:07 kaleb Exp $ */
+/* $XConsortium: vgaBitBlt.c,v 1.2 94/10/13 13:16:19 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaBitBlt.c,v 3.0 1994/07/24 11:58:16 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h
index dda6101a2..06782568d 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaFasm.h,v 1.3 95/01/05 20:50:47 kaleb Exp gildea $ */
+/* $XConsortium: vgaFasm.h,v 1.4 95/06/09 20:57:00 gildea Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/enhanced/vgaFasm.h,v 3.2 1994/10/21 11:24:26 dawes Exp $ */
/* Copyright 1992 by James Tsillas, Arlignton, Massachusetts.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile b/xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile
index def27f7cf..65074de43 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.3 95/01/06 20:58:59 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.4 95/01/26 15:41:36 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/Imakefile,v 3.4 1995/01/26 02:21:32 dawes Exp $
#include <Server.tmpl>
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c b/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c
index 7fb92b77b..32183f786 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vga.c,v 1.5 95/01/06 20:59:00 kaleb Exp kaleb $ */
+/* $XConsortium: vga.c,v 1.6 95/01/16 13:18:27 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.c,v 3.28 1995/01/11 03:52:41 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h b/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h
index a79007a38..8a8a972aa 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vga.h,v 1.3 95/01/05 20:51:07 kaleb Exp kaleb $ */
+/* $XConsortium: vga.h,v 1.4 95/01/16 13:18:28 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h,v 3.6 1995/01/10 10:35:38 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h
index 242982f11..06ef4ea6e 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaAsm.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaAsm.h,v 1.2 94/11/01 11:04:42 kaleb Exp kaleb $ */
+/* $XConsortium: vgaAsm.h,v 1.3 95/01/13 20:13:39 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgAsm.h,v 3.0 1994/11/26 12:48:16 dawes Exp $ */
/* Definitions for VGA bank assembler routines */
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h
index 3cfd84a29..c72c6cc83 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaBank.h,v 1.3 94/11/01 11:05:16 kaleb Exp kaleb $ */
+/* $XConsortium: vgaBank.h,v 1.4 95/01/05 20:51:38 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.h,v 3.1 1994/11/26 12:48:17 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s
index 86d5fb725..35b2bacfb 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaBank.s,v 1.1 94/10/05 13:51:06 kaleb Exp $ */
+/* $XConsortium: vgaBank.s,v 1.3 94/10/13 13:04:50 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaBank.s,v 3.1 1994/05/06 08:27:17 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c
index 9058d6601..69c4a385f 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vgaCmap.c,v 1.1 94/10/05 13:51:06 kaleb Exp $ */
+/* $XConsortium: vgaCmap.c,v 1.2 94/10/13 13:04:50 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaCmap.c,v 3.1 1994/08/01 13:20:24 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c
index d5d7687be..81e08c658 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: vgaHW.c,v 1.5 95/01/05 20:51:38 kaleb Exp kaleb $
+ * $XConsortium: vgaHW.c,v 1.6 95/01/06 20:59:04 kaleb Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgaHW.c,v 3.15 1994/12/29 10:21:23 dawes Exp $
*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
diff --git a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c
index ef9193c6c..55b006908 100644
--- a/xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c
+++ b/xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cfbpntwin.c,v 1.2 94/04/17 20:32:22 dpw Exp $ */
+/* $XConsortium: vgapwinS.c,v 1.1 95/01/26 15:06:18 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/vga/vgapwinS.c,v 3.0 1994/07/24 11:59:07 dawes Exp $ */
/***********************************************************
diff --git a/xc/programs/Xserver/hw/xfree86/xf86Version.h b/xc/programs/Xserver/hw/xfree86/xf86Version.h
index 96865a314..2a1481cdc 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86Version.h
+++ b/xc/programs/Xserver/hw/xfree86/xf86Version.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xf86Version.h,v 1.5 95/01/16 13:16:09 kaleb Exp kaleb $ */
+/* $XConsortium: xf86Version.h,v 1.6 95/01/23 15:33:26 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.68 1995/01/23 01:28:10 dawes Exp $ */
#define XF86_VERSION " 3.1.1 "
diff --git a/xc/programs/Xserver/hw/xfree86/xf86config/Cards b/xc/programs/Xserver/hw/xfree86/xf86config/Cards
index 0a4823b77..12748c709 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86config/Cards
+++ b/xc/programs/Xserver/hw/xfree86/xf86config/Cards
@@ -18,7 +18,7 @@
# The majority of entries are just a binding of a model name to a
# chipset/server and untested.
#
-# $XConsortium: Cards,v 1.2 95/01/16 13:18:29 kaleb Exp kaleb $
+# $XConsortium: Cards,v 1.3 95/01/23 15:35:21 kaleb Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.6 1995/01/23 01:33:04 dawes Exp $
# Cirrus Logic
diff --git a/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile b/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
index 712124587..54adf9841 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: $
+XCOMM $XConsortium: Imakefile,v 1.2 95/01/06 20:59:07 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.1 1995/01/02 05:02:57 dawes Exp $
SRCS = xf86config.c cards.c
diff --git a/xc/programs/Xserver/hw/xfree86/xf86config/cards.c b/xc/programs/Xserver/hw/xfree86/xf86config/cards.c
index 5e492bd25..f46dd898d 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86config/cards.c
+++ b/xc/programs/Xserver/hw/xfree86/xf86config/cards.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cards.c,v 1.3 95/01/23 15:35:22 kaleb Exp gildea $ */
+/* $XConsortium: cards.c,v 1.4 95/06/09 20:57:00 gildea Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.2 1995/01/23 01:33:07 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/xf86config/cards.h b/xc/programs/Xserver/hw/xfree86/xf86config/cards.h
index 29ec625f3..87b975d96 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86config/cards.h
+++ b/xc/programs/Xserver/hw/xfree86/xf86config/cards.h
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: cards.h,v 1.1 95/01/06 20:53:10 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.0 1995/01/02 05:02:59 dawes Exp $ */
#ifndef CARD_DATABASE_FILE
diff --git a/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c b/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
index 0a9c333e0..d5055321f 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
+++ b/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c
@@ -1,4 +1,4 @@
-/* $XConsortium: $ */
+/* $XConsortium: xf86config.c,v 1.5 95/06/19 19:36:09 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.8 1995/01/23 01:33:09 dawes Exp $ */
/*
diff --git a/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man b/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man
index 75b944d98..614db496f 100644
--- a/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man
+++ b/xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: $
+.\" $XConsortium: xf86config.man,v 1.3 95/06/19 19:36:09 kaleb Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86conf.man,v 3.1 1995/01/15 10:35:54 dawes Exp $
.TH xf86config 1 "Version 3.1.1" "XFree86"
.SH NAME
diff --git a/xc/programs/Xserver/hw/xnest/Args.c b/xc/programs/Xserver/hw/xnest/Args.c
index 25d8710a4..fc47e9de9 100644
--- a/xc/programs/Xserver/hw/xnest/Args.c
+++ b/xc/programs/Xserver/hw/xnest/Args.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Args.c,v 1.1 93/07/12 15:27:49 rws Exp ray $ */
+/* $XConsortium: Args.c,v 1.2 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Args.h b/xc/programs/Xserver/hw/xnest/Args.h
index 22bb2df3d..3841bf182 100644
--- a/xc/programs/Xserver/hw/xnest/Args.h
+++ b/xc/programs/Xserver/hw/xnest/Args.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestArgs.h,v 1.1 93/06/23 16:23:44 dmatic Exp $ */
+/* $XConsortium: Args.h,v 1.1 93/07/12 15:27:56 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Color.c b/xc/programs/Xserver/hw/xnest/Color.c
index d95886d34..c5aee2bc1 100644
--- a/xc/programs/Xserver/hw/xnest/Color.c
+++ b/xc/programs/Xserver/hw/xnest/Color.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Color.c,v 1.4 94/03/31 17:48:44 dpw Exp ray $ */
+/* $XConsortium: Color.c,v 1.5 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Color.h b/xc/programs/Xserver/hw/xnest/Color.h
index 196f20bef..1d0d7172f 100644
--- a/xc/programs/Xserver/hw/xnest/Color.h
+++ b/xc/programs/Xserver/hw/xnest/Color.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestColor.h,v 1.1 93/06/23 16:23:45 dmatic Exp $ */
+/* $XConsortium: Color.h,v 1.1 93/07/12 15:28:00 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Cursor.c b/xc/programs/Xserver/hw/xnest/Cursor.c
index 3a209ea96..50d7832ed 100644
--- a/xc/programs/Xserver/hw/xnest/Cursor.c
+++ b/xc/programs/Xserver/hw/xnest/Cursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Cursor.c,v 1.3 94/03/31 17:49:09 dpw Exp ray $ */
+/* $XConsortium: Cursor.c,v 1.4 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Cursor.h b/xc/programs/Xserver/hw/xnest/Cursor.h
index 85c87daa9..975200e04 100644
--- a/xc/programs/Xserver/hw/xnest/Cursor.h
+++ b/xc/programs/Xserver/hw/xnest/Cursor.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestCursor.h,v 1.1 93/06/23 16:23:46 dmatic Exp $ */
+/* $XConsortium: Cursor.h,v 1.1 93/07/12 15:28:04 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Display.c b/xc/programs/Xserver/hw/xnest/Display.c
index 8e37a5636..762f6c0d4 100644
--- a/xc/programs/Xserver/hw/xnest/Display.c
+++ b/xc/programs/Xserver/hw/xnest/Display.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Display.c,v 1.2 94/02/06 17:51:11 rws Exp ray $ */
+/* $XConsortium: Display.c,v 1.3 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Display.h b/xc/programs/Xserver/hw/xnest/Display.h
index ccd55677a..21c03d2be 100644
--- a/xc/programs/Xserver/hw/xnest/Display.h
+++ b/xc/programs/Xserver/hw/xnest/Display.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Display.h,v 1.1 93/07/12 15:28:07 rws Exp $ */
+/* $XConsortium: Display.h,v 1.2 94/02/06 17:51:43 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Drawable.h b/xc/programs/Xserver/hw/xnest/Drawable.h
index 5247e549a..9ed719712 100644
--- a/xc/programs/Xserver/hw/xnest/Drawable.h
+++ b/xc/programs/Xserver/hw/xnest/Drawable.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestDrawable.h,v 1.1 93/06/23 16:23:48 dmatic Exp $ */
+/* $XConsortium: Drawable.h,v 1.1 93/07/12 15:28:11 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Events.c b/xc/programs/Xserver/hw/xnest/Events.c
index f756345f8..26fcf683a 100644
--- a/xc/programs/Xserver/hw/xnest/Events.c
+++ b/xc/programs/Xserver/hw/xnest/Events.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Events.c,v 1.3 94/01/07 09:52:34 dpw Exp ray $ */
+/* $XConsortium: Events.c,v 1.4 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Events.h b/xc/programs/Xserver/hw/xnest/Events.h
index bcb8b9eac..c5848f61d 100644
--- a/xc/programs/Xserver/hw/xnest/Events.h
+++ b/xc/programs/Xserver/hw/xnest/Events.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Events.h,v 1.1 93/07/12 15:28:16 rws Exp $ */
+/* $XConsortium: Events.h,v 1.2 93/09/23 18:57:02 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Font.c b/xc/programs/Xserver/hw/xnest/Font.c
index 4bd82f52a..00a66df3e 100644
--- a/xc/programs/Xserver/hw/xnest/Font.c
+++ b/xc/programs/Xserver/hw/xnest/Font.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Font.c,v 1.1 93/07/12 15:28:18 rws Exp ray $ */
+/* $XConsortium: Font.c,v 1.2 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Font.h b/xc/programs/Xserver/hw/xnest/Font.h
index db3b2e910..87cbebf05 100644
--- a/xc/programs/Xserver/hw/xnest/Font.h
+++ b/xc/programs/Xserver/hw/xnest/Font.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestFont.h,v 1.1 93/06/23 16:23:50 dmatic Exp $ */
+/* $XConsortium: Font.h,v 1.1 93/07/12 15:28:20 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/GC.c b/xc/programs/Xserver/hw/xnest/GC.c
index 674b8930d..e01515684 100644
--- a/xc/programs/Xserver/hw/xnest/GC.c
+++ b/xc/programs/Xserver/hw/xnest/GC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: GC.c,v 1.6 94/03/31 17:50:26 dpw Exp ray $ */
+/* $XConsortium: GC.c,v 1.7 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/GC.h b/xc/programs/Xserver/hw/xnest/GC.h
index 8f1fcb23a..51adb69d2 100644
--- a/xc/programs/Xserver/hw/xnest/GC.h
+++ b/xc/programs/Xserver/hw/xnest/GC.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestGC.h,v 1.1 93/06/23 16:23:50 dmatic Exp $ */
+/* $XConsortium: GC.h,v 1.1 93/07/12 15:28:24 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/GCOps.c b/xc/programs/Xserver/hw/xnest/GCOps.c
index c1ec480d5..087e0a061 100644
--- a/xc/programs/Xserver/hw/xnest/GCOps.c
+++ b/xc/programs/Xserver/hw/xnest/GCOps.c
@@ -1,4 +1,4 @@
-/* $XConsortium: GCOps.c,v 1.7 94/03/31 17:49:50 dpw Exp ray $ */
+/* $XConsortium: GCOps.c,v 1.8 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/GCOps.h b/xc/programs/Xserver/hw/xnest/GCOps.h
index aa05ab50a..98c31205b 100644
--- a/xc/programs/Xserver/hw/xnest/GCOps.h
+++ b/xc/programs/Xserver/hw/xnest/GCOps.h
@@ -1,4 +1,4 @@
-/* $XConsortium: GCOps.h,v 1.1 93/07/12 15:28:27 rws Exp $ */
+/* $XConsortium: GCOps.h,v 1.2 93/09/20 20:18:48 dpw Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/GetTime.c b/xc/programs/Xserver/hw/xnest/GetTime.c
index 9034dc424..bd4df1777 100644
--- a/xc/programs/Xserver/hw/xnest/GetTime.c
+++ b/xc/programs/Xserver/hw/xnest/GetTime.c
@@ -1,4 +1,4 @@
-/* $XConsortium: GetTime.c,v 1.4 94/04/12 17:26:51 dpw Exp $ */
+/* $XConsortium: GetTime.c,v 1.5 94/04/17 20:30:01 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/hw/xnest/Handlers.c b/xc/programs/Xserver/hw/xnest/Handlers.c
index a09545171..ecfd95ea8 100644
--- a/xc/programs/Xserver/hw/xnest/Handlers.c
+++ b/xc/programs/Xserver/hw/xnest/Handlers.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Handlers.c,v 1.1 93/07/12 15:28:29 rws Exp ray $ */
+/* $XConsortium: Handlers.c,v 1.2 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Handlers.h b/xc/programs/Xserver/hw/xnest/Handlers.h
index 28663b439..ef4380118 100644
--- a/xc/programs/Xserver/hw/xnest/Handlers.h
+++ b/xc/programs/Xserver/hw/xnest/Handlers.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestHandlers.h,v 1.1 93/06/23 16:23:52 dmatic Exp $ */
+/* $XConsortium: Handlers.h,v 1.1 93/07/12 15:28:31 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Imakefile b/xc/programs/Xserver/hw/xnest/Imakefile
index 99801258c..c23c9809e 100644
--- a/xc/programs/Xserver/hw/xnest/Imakefile
+++ b/xc/programs/Xserver/hw/xnest/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 94/10/28 20:47:10 dpw Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.5 95/01/16 15:53:55 kaleb Exp $
#include <Server.tmpl>
SRCS = Args.c \
diff --git a/xc/programs/Xserver/hw/xnest/Init.c b/xc/programs/Xserver/hw/xnest/Init.c
index 22fce3583..ea3ddcae6 100644
--- a/xc/programs/Xserver/hw/xnest/Init.c
+++ b/xc/programs/Xserver/hw/xnest/Init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Init.c,v 1.2 93/12/13 17:40:05 dpw Exp ray $ */
+/* $XConsortium: Init.c,v 1.3 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Init.h b/xc/programs/Xserver/hw/xnest/Init.h
index 1c8841278..84a81bfd1 100644
--- a/xc/programs/Xserver/hw/xnest/Init.h
+++ b/xc/programs/Xserver/hw/xnest/Init.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestInit.h,v 1.1 93/06/23 16:23:53 dmatic Exp $ */
+/* $XConsortium: Init.h,v 1.1 93/07/12 15:28:35 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Keyboard.c b/xc/programs/Xserver/hw/xnest/Keyboard.c
index f1f91464f..c3376c7fa 100644
--- a/xc/programs/Xserver/hw/xnest/Keyboard.c
+++ b/xc/programs/Xserver/hw/xnest/Keyboard.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Keyboard.c,v 1.2 94/02/23 15:56:46 dpw Exp ray $ */
+/* $XConsortium: Keyboard.c,v 1.3 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Keyboard.h b/xc/programs/Xserver/hw/xnest/Keyboard.h
index f4d683c9e..99eeacb10 100644
--- a/xc/programs/Xserver/hw/xnest/Keyboard.h
+++ b/xc/programs/Xserver/hw/xnest/Keyboard.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestKeyboard.h,v 1.1 93/06/23 16:23:54 dmatic Exp $ */
+/* $XConsortium: Keyboard.h,v 1.1 93/07/12 15:28:38 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Pixmap.c b/xc/programs/Xserver/hw/xnest/Pixmap.c
index 5b3b3c6d6..98f1e3389 100644
--- a/xc/programs/Xserver/hw/xnest/Pixmap.c
+++ b/xc/programs/Xserver/hw/xnest/Pixmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Pixmap.c,v 1.2 94/01/07 09:52:47 dpw Exp ray $ */
+/* $XConsortium: Pixmap.c,v 1.3 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Pixmap.h b/xc/programs/Xserver/hw/xnest/Pixmap.h
index 1d312eb9f..3331bb306 100644
--- a/xc/programs/Xserver/hw/xnest/Pixmap.h
+++ b/xc/programs/Xserver/hw/xnest/Pixmap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestPixmap.h,v 1.1 93/06/23 16:23:55 dmatic Exp $ */
+/* $XConsortium: Pixmap.h,v 1.1 93/07/12 15:28:41 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Pointer.c b/xc/programs/Xserver/hw/xnest/Pointer.c
index ab8b549c7..2cb765ba0 100644
--- a/xc/programs/Xserver/hw/xnest/Pointer.c
+++ b/xc/programs/Xserver/hw/xnest/Pointer.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Pointer.c,v 1.1 93/07/12 15:28:43 rws Exp ray $ */
+/* $XConsortium: Pointer.c,v 1.2 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Pointer.h b/xc/programs/Xserver/hw/xnest/Pointer.h
index cf7d2931b..784c1fe21 100644
--- a/xc/programs/Xserver/hw/xnest/Pointer.h
+++ b/xc/programs/Xserver/hw/xnest/Pointer.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestPointer.h,v 1.1 93/06/23 16:23:56 dmatic Exp $ */
+/* $XConsortium: Pointer.h,v 1.1 93/07/12 15:28:44 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Screen.c b/xc/programs/Xserver/hw/xnest/Screen.c
index 826e68055..f16adeb04 100644
--- a/xc/programs/Xserver/hw/xnest/Screen.c
+++ b/xc/programs/Xserver/hw/xnest/Screen.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Screen.c,v 1.4 94/02/06 17:52:40 rws Exp ray $ */
+/* $XConsortium: Screen.c,v 1.5 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Screen.h b/xc/programs/Xserver/hw/xnest/Screen.h
index 57f73de04..63b8d7085 100644
--- a/xc/programs/Xserver/hw/xnest/Screen.h
+++ b/xc/programs/Xserver/hw/xnest/Screen.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestScreen.h,v 1.1 93/06/23 16:23:57 dmatic Exp $ */
+/* $XConsortium: Screen.h,v 1.1 93/07/12 15:28:49 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/TestExt.c b/xc/programs/Xserver/hw/xnest/TestExt.c
index 001dd791f..c8c553d76 100644
--- a/xc/programs/Xserver/hw/xnest/TestExt.c
+++ b/xc/programs/Xserver/hw/xnest/TestExt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: TestExt.c,v 1.2 93/09/23 18:57:14 rws Exp dpw $ */
+/* $XConsortium: TestExt.c,v 1.3 94/10/28 20:47:10 dpw Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Visual.c b/xc/programs/Xserver/hw/xnest/Visual.c
index 33ca36741..33e261502 100644
--- a/xc/programs/Xserver/hw/xnest/Visual.c
+++ b/xc/programs/Xserver/hw/xnest/Visual.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Visual.c,v 1.1 93/07/12 15:28:52 rws Exp ray $ */
+/* $XConsortium: Visual.c,v 1.2 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Visual.h b/xc/programs/Xserver/hw/xnest/Visual.h
index 165ce411a..44c87c88a 100644
--- a/xc/programs/Xserver/hw/xnest/Visual.h
+++ b/xc/programs/Xserver/hw/xnest/Visual.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestVisual.h,v 1.1 93/06/23 16:23:58 dmatic Exp $ */
+/* $XConsortium: Visual.h,v 1.1 93/07/12 15:28:54 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Window.c b/xc/programs/Xserver/hw/xnest/Window.c
index f83e75b7c..cd8bddd15 100644
--- a/xc/programs/Xserver/hw/xnest/Window.c
+++ b/xc/programs/Xserver/hw/xnest/Window.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Window.c,v 1.5 94/02/16 11:53:17 rws Exp ray $ */
+/* $XConsortium: Window.c,v 1.6 95/07/10 17:42:22 ray Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Window.h b/xc/programs/Xserver/hw/xnest/Window.h
index 74094e8d7..9b96804a9 100644
--- a/xc/programs/Xserver/hw/xnest/Window.h
+++ b/xc/programs/Xserver/hw/xnest/Window.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestWindow.h,v 1.1 93/06/23 16:23:59 dmatic Exp $ */
+/* $XConsortium: Window.h,v 1.1 93/07/12 15:28:58 rws Exp $ */
/*
Copyright 1993 by Davor Matic
diff --git a/xc/programs/Xserver/hw/xnest/Xnest.h b/xc/programs/Xserver/hw/xnest/Xnest.h
index 6cd231b05..c61a1154f 100644
--- a/xc/programs/Xserver/hw/xnest/Xnest.h
+++ b/xc/programs/Xserver/hw/xnest/Xnest.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: Xnest.h,v 1.1 95/07/10 17:43:42 ray Exp $ */
/*
Copyright (c) 1995 X Consortium
diff --git a/xc/programs/Xserver/hw/xnest/Xnest.man b/xc/programs/Xserver/hw/xnest/Xnest.man
index 6d66ab7d3..da8a0b587 100644
--- a/xc/programs/Xserver/hw/xnest/Xnest.man
+++ b/xc/programs/Xserver/hw/xnest/Xnest.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: Xnest.man,v 1.2 94/04/12 17:26:27 dpw Exp $
+.\" $XConsortium: Xnest.man,v 1.3 94/04/17 20:30:03 dpw Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/Xserver/include/Imakefile b/xc/programs/Xserver/include/Imakefile
index 2e2de5523..7810d6f00 100644
--- a/xc/programs/Xserver/include/Imakefile
+++ b/xc/programs/Xserver/include/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/11/21 16:24:12 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.2 95/01/13 20:28:14 kaleb Exp $
XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.2 1994/12/02 05:48:52 dawes Exp $
all::
diff --git a/xc/programs/Xserver/include/POQ.h b/xc/programs/Xserver/include/POQ.h
deleted file mode 100644
index aa843e4b9..000000000
--- a/xc/programs/Xserver/include/POQ.h
+++ /dev/null
@@ -1,310 +0,0 @@
-
-/************************************************************************
- *
- * POQ.h --
- *
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- ************************************************************************/
-
-/* $XConsortium: POQ.h,v 1.3 93/12/03 01:21:09 rob Exp $ */
-
-#ifndef POQ_H
-#define POQ_H
-
-#include "X.h"
-#include "windowstr.h"
-#include "gc.h"
-#include "pixmapstr.h"
-#include "regionstr.h"
-#include "conflict.h"
-#include "xthreads.h"
-
-
-/***********************************************************************/
-
-typedef struct _Conflict {
- WindowPtr pWindow; /* pointer to window to lock */
- RegionPtr pRegion; /* pointer to region to lock */
- int windowMode; /* is pWindow a single window or subtree */
-} ConflictRec, *ConflictPtr;
-
-
-typedef struct _Extension {
- int extID; /* extension ID */
- Mask extConflictMask; /* extension conflict mask */
- pointer pExtConflict; /* pointer to extension conflict */
-} ExtensionRec, *ExtensionPtr;
-
-
-/*********************************
- * Read/Write conflict mask bits.
- * Bits 0 - 19 are Read/Write.
- *********************************/
-
-#define POQ_R_HIERARCHY ((Mask)1<<0)
-#define POQ_W_HIERARCHY ((Mask)1<<1)
-#define POQ_R_GEOMETRY ((Mask)1<<2)
-#define POQ_W_GEOMETRY ((Mask)1<<3)
-#define POQ_R_COLORMAP ((Mask)1<<4)
-#define POQ_W_COLORMAP ((Mask)1<<5)
-#define POQ_R_EVENT_PROP ((Mask)1<<6)
-#define POQ_W_EVENT_PROP ((Mask)1<<7)
-#define POQ_R_SCREENSAVER ((Mask)1<<8)
-#define POQ_W_SCREENSAVER ((Mask)1<<9)
-#define POQ_R_FONTPATH ((Mask)1<<10)
-#define POQ_W_FONTPATH ((Mask)1<<11)
-
-/*********************************
- * Write only conflict mask bits.
- * Bits 20 - 29 are Write only.
- *********************************/
-
-#define POQ_X_CURSOR ((Mask)1<<20)
-#define POQ_X_RENDER ((Mask)1<<21)
-#define POQ_X_ICCCM ((Mask)1<<22)
-#define POQ_X_SERVER ((Mask)1<<23)
-#define POQ_X_FONT ((Mask)1<<24)
-#define POQ_CONFIGURE ((Mask)1<<25)
-#define POQ_NO_CONFLICT ((Mask)1<<26)
-#define POQ_GRAB_SERVER ((Mask)1<<27)
-
-/*********************************************
- * Used to indicate that the extension
- * conflict bits should be checked.
- *********************************************/
-
-#define POQ_EXTENSION_BIT ((Mask)1<<31)
-
-
-/*********************************************
- * Used to determine which clipping region
- * in the WindowRec should be used.
- *********************************************/
-
-#define POQ_NULL_REGION 0
-#define POQ_CLIP_LIST 1
-#define POQ_BORDER_CLIP 2
-#define POQ_WIN_SIZE 3
-#define POQ_BORDER_SIZE 4
-
-/*********************************************
- * Used to indicate whether the pWindow field
- * in the ConflictRec indicates a single
- * window or a window subtree.
- *********************************************/
-
-#define POQ_NO_WINDOW 0
-#define POQ_SINGLE_WINDOW 1
-#define POQ_WINDOW_SUBTREE 2
-#define POQ_ALL_WINDOWS 3
-
-/*****************************************************
- * Used to tell the POQ how to handle region conflicts
- *****************************************************/
-
-#define POQ_1_BIT_PER_PIXEL 0
-#define POQ_8_BITS_PER_PIXEL 1
-#define POQ_24_BITS_PER_PIXEL 2
-#define POQ_32_BITS_PER_PIXEL 3
-#define POQ_USE_GRAPHICS_ACCEL 4
-
-
-/***********************************************************************
- *
- * Set no region or window conflicts.
- *
- ***********************************************************************/
-
-#define POQ_SET_NULL_CONFLICT(client) \
-{ \
- ((ConflictPtr)(client)->pConflict)->windowMode = POQ_NO_WINDOW; \
- ((ConflictPtr)(client)->pConflict)->pWindow = (WindowPtr)NULL; \
- ((ConflictPtr)(client)->pConflict)->pRegion = (RegionPtr)NULL; \
-}
-
-/***********************************************************************
- *
- * Lock the root window and region representing entire screen.
- *
- ***********************************************************************/
-
-#define POQ_SET_ALL_CONFLICT(client) \
-{ \
- ((ConflictPtr)(client)->pConflict)->windowMode = POQ_ALL_WINDOWS; \
- ((ConflictPtr)(client)->pConflict)->pWindow = (WindowPtr)NULL; \
- ((ConflictPtr)(client)->pConflict)->pRegion = &VisibleRegion; \
-}
-
-/***********************************************************************
- *
- * If the drawable is a window, lock the region determined by
- * the subWindowMode in the GC.
- *
- ***********************************************************************/
-
-#define POQ_SET_RENDER_CONFLICT(client, pDraw, pGC) \
-{ \
- if ((pDraw)->type == DRAWABLE_WINDOW) \
- { \
- WindowPtr _pWin = (WindowPtr)(pDraw); \
- \
- if ((pGC)->subWindowMode == IncludeInferiors) \
- { \
- ((ConflictPtr)(client)->pConflict)->pRegion = &(_pWin->borderClip);\
- } \
- else \
- { \
- ((ConflictPtr)(client)->pConflict)->pRegion = &(_pWin->clipList);\
- } \
- ((ConflictPtr)(client)->pConflict)->pWindow = _pWin; \
- ((ConflictPtr)(client)->pConflict)->windowMode = POQ_SINGLE_WINDOW; \
- } \
- else \
- { \
- POQ_SET_NULL_CONFLICT(client); \
- } \
-}
-
-/***********************************************************************
- *
- * Lock the region in the window specified by regionType.
- *
- ***********************************************************************/
-
-#define POQ_SET_WINDOW_CONFLICT(client, pWin, regionType) \
-{ \
- switch (regionType) \
- { \
- case POQ_CLIP_LIST: \
- ((ConflictPtr)(client)->pConflict)->pRegion = &((pWin)->clipList);\
- break; \
- \
- case POQ_BORDER_CLIP: \
- ((ConflictPtr)(client)->pConflict)->pRegion = &((pWin)->borderClip);\
- break; \
- \
- case POQ_WIN_SIZE: \
- ((ConflictPtr)(client)->pConflict)->pRegion = &((pWin)->winSize);\
- break; \
- \
- case POQ_BORDER_SIZE: \
- ((ConflictPtr)(client)->pConflict)->pRegion = &((pWin)->borderSize);\
- break; \
- \
- case POQ_NULL_REGION: \
- /* fall through */ \
- default: \
- ((ConflictPtr)(client)->pConflict)->pRegion = (RegionPtr)NULL;\
- break; \
- } \
- ((ConflictPtr)(client)->pConflict)->pWindow = (pWin); \
- ((ConflictPtr)(client)->pConflict)->windowMode = POQ_WINDOW_SUBTREE;\
-}
-
-/***********************************************************************
- *
- * If the drawable passed in is a window, lock the border region.
- *
- ***********************************************************************/
-
-#define POQ_SET_DRAWABLE_CONFLICT(client, pDraw) \
-{ \
- if ((pDraw)->type == DRAWABLE_WINDOW) \
- { \
- ((ConflictPtr)(client)->pConflict)->pWindow = (WindowPtr)(pDraw);\
- ((ConflictPtr)(client)->pConflict)->windowMode = POQ_WINDOW_SUBTREE;\
- ((ConflictPtr)(client)->pConflict)->pRegion = \
- &(((WindowPtr)(pDraw))->borderSize); \
- } \
- else \
- { \
- POQ_SET_NULL_CONFLICT((client)); \
- } \
-}
-
-/***********************************************************************
- *
- * Set the region and window conflicts.
- *
- ***********************************************************************/
-
-#define POQ_SET_REGION_CONFLICT(client, pWin, pReg) \
-{ \
- ((ConflictPtr)(client)->pConflict)->windowMode = POQ_WINDOW_SUBTREE;\
- ((ConflictPtr)(client)->pConflict)->pWindow = (pWin); \
- ((ConflictPtr)(client)->pConflict)->pRegion = (pReg); \
-}
-
-/***********************************************************************
- *
- * Set conflicts for extensions.
- *
- ***********************************************************************/
-
-#define POQ_SET_EXTENSION_CONFLICT(client, conflictMask, pExtConflict) \
-{ \
- int extID = (int)(((xReq *)client->requestBuffer)->reqType); \
- \
- ((ConflictPtr)(client)->pExtInfo)->extID = extID; \
- ((ConflictPtr)(client)->pExtInfo)->extConflictMask = conflictMask; \
- ((ConflictPtr)(client)->pExtInfo)->pExtConflict = pExtConflict; \
-}
-/***********************************************************************
- *
- * NEW MACROS: For STX,MTX merge, these cover the Lock/UnlockDevicesAndPOQ
- * function call.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTXLockDevicesAndPOQ(client, mapping) \
- LockDevicesAndPOQ(client, mapping)
-#define MTXUnlockDevicesAndPOQ(client) \
- UnlockDevicesAndPOQ(client)
-#else
-#define MTXLockDevicesAndPOQ(client, mapping) /* nothing */
-#define MTXUnlockDevicesAndPOQ(client) /* nothing */
-#endif
-
-/***********************************************************************/
-
-extern void POQInitializeMonitor();
-extern void POQDestroyMonitor();
-extern void POQSetRegionConflictFunc();
-extern void POQSelectRegionConflictType();
-extern void POQSetExtConflictFunc();
-extern void POQInitClient();
-extern void POQLock();
-#ifdef XTHREADS
-extern void POQUnlock();
-#endif
-extern void POQGrabServer();
-extern void POQUngrabServer();
-extern void POQComeUpForAir();
-
-extern RegionRec VisibleRegion;
-
-/***********************************************************************/
-
-#endif /* POQ_H */
diff --git a/xc/programs/Xserver/include/cit.h b/xc/programs/Xserver/include/cit.h
deleted file mode 100644
index 8bc8e2c9a..000000000
--- a/xc/programs/Xserver/include/cit.h
+++ /dev/null
@@ -1,156 +0,0 @@
-
-/************************************************************************
- *
- * cit.h --
- *
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- ************************************************************************/
-
-/* $XConsortium: cit.h,v 1.1 93/11/12 17:02:56 rob Exp $ */
-
-#ifndef CIT_H
-#define CIT_H
-
-#include "misc.h"
-
-
-/***********************************************************************/
-
-#define RECALCULATE_NEXT_FREE_CLIENT(cid) \
-{ \
- if ((cid) < nextFreeClientID) \
- { \
- nextFreeClientID = (cid); \
- } \
- clients[(cid)] = NullClient; \
- \
- while (!clients[currentMaxClients-1]) \
- { \
- currentMaxClients--; \
- } \
-}
-
-/***********************************************************************/
-
-#define get_req_len(req,cli) ((cli)->swapped ? \
- lswaps((req)->length) : (req)->length)
-
-#define get_big_req_len(req,cli) ((cli)->swapped ? \
- lswapl(((xBigReq *)(req))->length) : \
- ((xBigReq *)(req))->length)
-typedef struct {
- CARD8 reqType;
- CARD8 data;
- CARD16 zero B16;
- CARD32 length B32;
-} xBigReq;
-
-/***********************************************************************/
-
-#define GET_BYTES_NEEDED(client, gotnow, needed, move_header) \
-{ \
- if (gotnow < sizeof(xReq)) \
- { \
- needed = sizeof(xReq); \
- } \
- else \
- { \
- needed = get_req_len((xReq *)oci->bufptr, client); \
- if (!needed && client->big_requests) \
- { \
- move_header = TRUE; \
- if (gotnow < sizeof(xBigReq)) \
- { \
- needed = sizeof(xBigReq) >> 2; \
- } \
- else \
- { \
- needed = get_big_req_len((xReq *)oci->bufptr, client); \
- } \
- } \
- client->req_len = needed; \
- if (needed) \
- { \
- needed <<= 2; \
- } \
- else \
- { \
- needed = (client->big_requests) ? sizeof(xBigReq): sizeof(xReq);\
- } \
- } \
-}
-
-/***********************************************************************/
-
-#define READ_REQUEST_FROM_CLIENT(gotnow, client) \
-{ \
- register Bool move_header = FALSE; \
- register int needed; \
- register ConnectionInputPtr oci; \
- \
- oci = ((OsCommPtr) client->osPrivate)->input; \
- \
- oci->bufptr += oci->lenLastReq; \
- gotnow = oci->bufcnt + oci->buffer - oci->bufptr; \
- \
- GET_BYTES_NEEDED(client, gotnow, needed, move_header); \
- \
- while (gotnow < needed) \
- { \
- gotnow = ReadRequestFromClient(client, gotnow, needed); \
- if (gotnow <= 0) \
- { \
- goto close_down; \
- } \
- GET_BYTES_NEEDED(client, gotnow, needed, move_header); \
- } \
- oci->lenLastReq = needed; \
- if (move_header) \
- { \
- register xReq *request; \
- \
- request = (xReq *)oci->bufptr; \
- oci->bufptr += (sizeof(xBigReq) - sizeof(xReq)); \
- *(xReq *)oci->bufptr = *request; \
- oci->lenLastReq -= (sizeof(xBigReq) - sizeof(xReq)); \
- client->req_len -= (sizeof(xBigReq) - sizeof(xReq)) >> 2; \
- } \
- client->requestBuffer = (pointer)oci->bufptr; \
-}
-
-/***********************************************************************/
-
-/* exported functions */
-
-extern Bool CreateClientInputThread();
-extern void CloseDownClient();
-extern void KillAllClients();
-extern void CloseDownRetainedResources();
-extern void InitClientGlobals();
-extern void InitClient();
-extern unsigned long GetNextSerialNumber();
-extern void MarkClientException();
-
-#endif /* CIT_H */
diff --git a/xc/programs/Xserver/include/closestr.h b/xc/programs/Xserver/include/closestr.h
index b91cd9a8b..c697e7788 100644
--- a/xc/programs/Xserver/include/closestr.h
+++ b/xc/programs/Xserver/include/closestr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: closestr.h,v 1.9 94/04/17 20:25:29 dpw Exp $ */
+/* $XConsortium: closestr.h,v 1.10 95/05/19 19:18:55 dpw Exp $ */
/*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/include/closure.h b/xc/programs/Xserver/include/closure.h
index 2c60ca646..f83465575 100644
--- a/xc/programs/Xserver/include/closure.h
+++ b/xc/programs/Xserver/include/closure.h
@@ -1,4 +1,4 @@
-/* $XConsortium: closure.h,v 1.2 93/08/24 18:49:57 gildea Exp $ */
+/* $XConsortium: closure.h,v 1.3 94/04/17 20:25:31 gildea Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/colormap.h b/xc/programs/Xserver/include/colormap.h
index 1af233d60..c1a6d09c4 100644
--- a/xc/programs/Xserver/include/colormap.h
+++ b/xc/programs/Xserver/include/colormap.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: colormap.h,v 1.27 94/01/21 21:54:15 dpw Exp $ */
+/* $XConsortium: colormap.h,v 1.28 94/04/17 20:25:32 dpw Exp $ */
#ifndef CMAP_H
#define CMAP_H 1
diff --git a/xc/programs/Xserver/include/colormapst.h b/xc/programs/Xserver/include/colormapst.h
index 3bb5da15e..b3d2de3a2 100644
--- a/xc/programs/Xserver/include/colormapst.h
+++ b/xc/programs/Xserver/include/colormapst.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: colormapst.h,v 1.6 88/09/06 15:49:00 jim Exp $ */
+/* $XConsortium: colormapst.h,v 1.7 94/04/17 20:25:33 jim Exp $ */
#ifndef CMAPSTRUCT_H
#define CMAPSTRUCT_H 1
diff --git a/xc/programs/Xserver/include/conflict.h b/xc/programs/Xserver/include/conflict.h
deleted file mode 100644
index a9e7b909a..000000000
--- a/xc/programs/Xserver/include/conflict.h
+++ /dev/null
@@ -1,298 +0,0 @@
-
-/************************************************************************
- *
- * conflict.h --
- *
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- ************************************************************************/
-
-/* $XConsortium: conflict.h,v 1.1 93/11/12 17:03:04 rob Exp $ */
-
-#ifndef CONFLICT_H
-#define CONFLICT_H
-
-
-/***********************************************
- * Aliases for Read/Write conflict bits so that
- * a write lock also implies a read lock.
- ***********************************************/
-
-#define CM_R_HIERARCHY POQ_R_HIERARCHY
-#define CM_W_HIERARCHY POQ_R_HIERARCHY | POQ_W_HIERARCHY
-#define CM_R_GEOMETRY POQ_R_GEOMETRY
-#define CM_W_GEOMETRY POQ_R_GEOMETRY | POQ_W_GEOMETRY
-#define CM_R_COLORMAP POQ_R_COLORMAP
-#define CM_W_COLORMAP POQ_R_COLORMAP | POQ_W_COLORMAP
-#define CM_R_EVENT_PROP POQ_R_EVENT_PROP
-#define CM_W_EVENT_PROP POQ_R_EVENT_PROP | POQ_W_EVENT_PROP
-#define CM_R_SCREENSAVER POQ_R_SCREENSAVER
-#define CM_W_SCREENSAVER POQ_R_SCREENSAVER | POQ_W_SCREENSAVER
-#define CM_R_FONTPATH POQ_R_FONTPATH
-#define CM_W_FONTPATH POQ_R_FONTPATH | POQ_W_FONTPATH
-
-/*********************************
- * Write only conflict mask bits.
- *********************************/
-
-#ifdef USE_SOFTWARE_CURSOR
-#define CM_X_CURSOR POQ_X_CURSOR | POQ_X_RENDER
-#else
-#define CM_X_CURSOR POQ_X_CURSOR
-#endif
-#define CM_X_RENDER POQ_X_RENDER
-#define CM_X_ICCCM POQ_X_ICCCM
-#define CM_X_SERVER POQ_X_SERVER
-#define CM_X_FONT POQ_X_FONT
-
-#define CM_CONFIGURE POQ_CONFIGURE
-#define CM_NO_CONFLICT POQ_NO_CONFLICT
-#define CM_GRAB_SERVER ((Mask)~0L)
-
-/*********************************************
- * Used to indicate that the extension
- * conflict bits should be checked.
- *********************************************/
-
-#define CM_EXTENSION_BIT POQ_EXTENSION_BIT
-
-
-/***************************************************************
- * The following are commonly referenced conflicts groups.
- ***************************************************************/
-
-#define CM_XRender (CM_R_GEOMETRY | CM_X_RENDER)
-
-#define CM_XEvent (CM_R_HIERARCHY | CM_R_GEOMETRY | CM_R_EVENT_PROP)
-
-#define CM_XEventCursor (CM_XEvent | CM_X_CURSOR)
-
-#define CM_XExposure (CM_W_HIERARCHY | CM_W_GEOMETRY | CM_W_EVENT_PROP | \
- CM_X_RENDER)
-
-
-/**************************************************************************
- * Conflict masks for individual protocol requests (catagorized by object)
- **************************************************************************/
-
-/*------------------------ Window ---------------------------------------*/
-
-#define CM_XCreateWindow (CM_W_HIERARCHY | CM_R_COLORMAP |\
- CM_X_CURSOR | CM_R_SCREENSAVER)
-#define CM_XChangeWindowAttributes (CM_XExposure | CM_W_COLORMAP | CM_X_CURSOR)
-#define CM_XGetWindowAttributes (CM_R_GEOMETRY | CM_W_EVENT_PROP |\
- CM_R_COLORMAP | CM_X_CURSOR)
-#define CM_XDestroyWindow (CM_XExposure)
-#define CM_XDestroySubwindows (CM_XExposure)
-#define CM_XChangeSaveSet (CM_W_EVENT_PROP)
-#define CM_XReparentWindow (CM_W_HIERARCHY | CM_W_GEOMETRY |\
- CM_X_RENDER | CM_R_SCREENSAVER)
-#define CM_XMapWindow (CM_XExposure)
-#define CM_XMapSubwindows (CM_XExposure)
-#define CM_XUnmapWindow (CM_XExposure)
-#define CM_XUnmapSubwindows (CM_XExposure | CM_R_SCREENSAVER)
-#define CM_XConfigureWindow (CM_XExposure | CM_CONFIGURE)
-#define CM_XCirculateWindow (CM_XExposure | CM_R_SCREENSAVER)
-#define CM_XGetGeometry (CM_R_GEOMETRY)
-#define CM_XQueryTree (CM_W_HIERARCHY | CM_R_SCREENSAVER)
-#define CM_XTranslateCoords (CM_R_HIERARCHY)
-
-/*------------------------ Atom -----------------------------------------*/
-
-#define CM_XInternAtom (CM_X_ICCCM)
-#define CM_XGetAtomName (CM_X_ICCCM)
-
-/*------------------------ Property -------------------------------------*/
-
-#define CM_XDeleteProperty (CM_X_ICCCM)
-#define CM_XRotateProperties (CM_X_ICCCM | CM_W_EVENT_PROP)
-#define CM_XChangeProperty (CM_X_ICCCM)
-#define CM_XGetProperty (CM_X_ICCCM | CM_W_EVENT_PROP)
-#define CM_XListProperties (CM_X_ICCCM | CM_W_EVENT_PROP)
-
-/*------------------------ Selection ------------------------------------*/
-
-#define CM_XSetSelectionOwner (CM_X_ICCCM | CM_W_EVENT_PROP)
-#define CM_XGetSelectionOwner (CM_X_ICCCM | CM_W_EVENT_PROP)
-#define CM_XConvertSelection (CM_X_ICCCM | CM_W_EVENT_PROP)
-
-/*------------------------ Event ----------------------------------------*/
-
-#define CM_XSendEvent (CM_XEventCursor)
-#define CM_XAllowEvents (CM_XEventCursor)
-
-/*------------------------ Pointer --------------------------------------*/
-
-#define CM_XWarpPointer (CM_XEventCursor)
-#define CM_XChangeActivePointerGrab (CM_XEventCursor)
-#define CM_XGrabPointer (CM_XEventCursor)
-#define CM_XUngrabPointer (CM_XEventCursor)
-#define CM_XQueryPointer (CM_XEvent)
-#define CM_XSetPointerMapping (CM_NO_CONFLICT)
-#define CM_XGetPointerMapping (CM_NO_CONFLICT)
-#define CM_XChangePointerControl (CM_NO_CONFLICT)
-#define CM_XGetPointerControl (CM_NO_CONFLICT)
-
-/*------------------------ Button ---------------------------------------*/
-
-#define CM_XGrabButton (CM_X_CURSOR)
-#define CM_XUngrabButton (CM_W_EVENT_PROP)
-
-/*------------------------ Keyboard -------------------------------------*/
-
-#define CM_XGrabKeyboard (CM_XEventCursor)
-#define CM_XUngrabKeyboard (CM_XEventCursor)
-#define CM_XUngrabKey (CM_W_EVENT_PROP)
-#define CM_XGrabKey (CM_W_EVENT_PROP)
-#define CM_XSetModifierMapping (CM_NO_CONFLICT)
-#define CM_XGetModifierMapping (CM_NO_CONFLICT)
-#define CM_XGetKeyboardMapping (CM_NO_CONFLICT)
-#define CM_XChangeKeyboardMapping (CM_NO_CONFLICT)
-#define CM_XChangeKeyboardControl (CM_NO_CONFLICT)
-#define CM_XGetKeyboardControl (CM_NO_CONFLICT)
-#define CM_XBell (CM_NO_CONFLICT)
-#define CM_XQueryKeymap (CM_NO_CONFLICT)
-#define CM_XGetMotionEvents (CM_NO_CONFLICT)
-
-/*------------------------ Focus ----------------------------------------*/
-
-#define CM_XSetInputFocus (CM_XEventCursor)
-#define CM_XGetInputFocus (CM_R_GEOMETRY)
-
-/*------------------------ Server ---------------------------------------*/
-
-#define CM_XGrabServer (CM_GRAB_SERVER)
-#define CM_XUngrabServer (CM_NO_CONFLICT)
-
-/*------------------------ Font -----------------------------------------*/
-
-#define CM_XOpenFont (CM_X_FONT | CM_R_FONTPATH)
-#define CM_XCloseFont (CM_NO_CONFLICT)
-#define CM_XQueryFont (CM_NO_CONFLICT)
-#define CM_XQueryTextExtents (CM_NO_CONFLICT)
-#define CM_XListFonts (CM_R_FONTPATH)
-#define CM_XListFontsWithInfo (CM_R_FONTPATH)
-#define CM_XSetFontPath (CM_X_FONT | CM_W_FONTPATH)
-#define CM_XGetFontPath (CM_R_FONTPATH)
-
-/*------------------------ Pixmap ---------------------------------------*/
-
-#define CM_XCreatePixmap (CM_NO_CONFLICT)
-#define CM_XFreePixmap (CM_NO_CONFLICT)
-
-/*------------------------ GC -------------------------------------------*/
-
-#define CM_XCreateGC (CM_NO_CONFLICT)
-#define CM_XChangeGC (CM_NO_CONFLICT)
-#define CM_XCopyGC (CM_NO_CONFLICT)
-#define CM_XSetDashes (CM_NO_CONFLICT)
-#define CM_XSetClipRectangles (CM_NO_CONFLICT)
-#define CM_XFreeGC (CM_NO_CONFLICT)
-
-/*------------------------ GC Area --------------------------------------*/
-
-#define CM_XClearToBackground (CM_XRender)
-#define CM_XCopyArea (CM_XRender)
-#define CM_XCopyPlane (CM_XRender)
-
-/*------------------------ GC 2D ----------------------------------------*/
-
-#define CM_XPolyPoint (CM_XRender)
-#define CM_XPolyLine (CM_XRender)
-#define CM_XPolySegment (CM_XRender)
-#define CM_XPolyRectangle (CM_XRender)
-#define CM_XPolyArc (CM_XRender)
-#define CM_XFillPoly (CM_XRender)
-#define CM_XPolyFillRectangle (CM_XRender)
-#define CM_XPolyFillArc (CM_XRender)
-
-/*------------------------ Image ----------------------------------------*/
-
-#define CM_XPutImage (CM_XRender)
-#define CM_XGetImage (CM_XRender)
-
-/*------------------------ Text -----------------------------------------*/
-
-#define CM_XPolyText (CM_XRender)
-#define CM_XImageText8 (CM_XRender)
-#define CM_XImageText16 (CM_XRender)
-
-/*------------------------ Colormap -------------------------------------*/
-
-#define CM_XCreateColormap (CM_R_COLORMAP)
-#define CM_XFreeColormap (CM_W_COLORMAP)
-#define CM_XCopyColormapAndFree (CM_W_COLORMAP)
-#define CM_XInstallColormap (CM_W_COLORMAP)
-#define CM_XUninstallColormap (CM_W_COLORMAP)
-#define CM_XListInstalledColormaps (CM_R_COLORMAP)
-#define CM_XAllocColor (CM_W_COLORMAP)
-#define CM_XAllocNamedColor (CM_W_COLORMAP)
-#define CM_XAllocColorCells (CM_W_COLORMAP)
-#define CM_XAllocColorPlanes (CM_W_COLORMAP)
-#define CM_XFreeColors (CM_W_COLORMAP)
-#define CM_XStoreColors (CM_W_COLORMAP)
-#define CM_XStoreNamedColor (CM_W_COLORMAP)
-#define CM_XQueryColors (CM_W_COLORMAP)
-#define CM_XLookupColor (CM_W_COLORMAP)
-
-/*------------------------ Cursor ---------------------------------------*/
-
-#define CM_XCreateCursor (CM_X_CURSOR)
-#define CM_XCreateGlyphCursor (CM_X_CURSOR)
-#define CM_XFreeCursor (CM_X_CURSOR)
-#define CM_XRecolorCursor (CM_X_CURSOR | CM_W_EVENT_PROP)
-#define CM_XQueryBestSize (CM_R_GEOMETRY)
-
-/*------------------------ Extension ------------------------------------*/
-
-#define CM_XQueryExtension (CM_NO_CONFLICT)
-#define CM_XListExtensions (CM_NO_CONFLICT)
-
-/*------------------------ Screen Saver ---------------------------------*/
-
-#define CM_XSetScreenSaver (CM_W_SCREENSAVER)
-#define CM_XGetScreenSaver (CM_R_SCREENSAVER)
-#define CM_XForceScreenSaver (CM_W_SCREENSAVER)
-
-/*------------------------ Access Control -------------------------------*/
-
-#define CM_XChangeHosts (CM_X_SERVER)
-#define CM_XListHosts (CM_X_SERVER)
-#define CM_XChangeAccessControl (CM_X_SERVER)
-
-/*------------------------ Client ---------------------------------------*/
-
-#define CM_XKillClient (CM_GRAB_SERVER)
-#define CM_XChangeCloseDownMode (CM_X_SERVER)
-
-/*------------------------ Misc -----------------------------------------*/
-
-#define CM_XNoOperation (CM_NO_CONFLICT)
-#define CM_XBadRequest (CM_NO_CONFLICT)
-
-#define CM_XDeviceInputThread (CM_X_CURSOR | CM_W_EVENT_PROP | \
- CM_W_SCREENSAVER)
-
-
-#endif /* CONFLICT_H */
diff --git a/xc/programs/Xserver/include/cursor.h b/xc/programs/Xserver/include/cursor.h
index 01eae4f4d..c583a37a1 100644
--- a/xc/programs/Xserver/include/cursor.h
+++ b/xc/programs/Xserver/include/cursor.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: cursor.h,v 1.21 94/02/23 15:47:03 dpw Exp $ */
+/* $XConsortium: cursor.h,v 1.22 94/04/17 20:25:34 dpw Exp $ */
#ifndef CURSOR_H
#define CURSOR_H
diff --git a/xc/programs/Xserver/include/cursorstr.h b/xc/programs/Xserver/include/cursorstr.h
index 2fd4d0b21..83b3ab65f 100644
--- a/xc/programs/Xserver/include/cursorstr.h
+++ b/xc/programs/Xserver/include/cursorstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: cursorstr.h,v 1.7 93/07/12 09:45:03 dpw Exp $ */
+/* $XConsortium: cursorstr.h,v 1.8 94/04/17 20:25:35 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/dix.h b/xc/programs/Xserver/include/dix.h
index 14c32fe69..f31f9f8de 100644
--- a/xc/programs/Xserver/include/dix.h
+++ b/xc/programs/Xserver/include/dix.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: dix.h,v 1.83 94/12/02 19:16:33 mor Exp $ */
+/* $XConsortium: dix.h,v 1.84 95/03/03 01:54:22 dpw Exp $ */
#ifndef DIX_H
#define DIX_H
diff --git a/xc/programs/Xserver/include/dixfont.h b/xc/programs/Xserver/include/dixfont.h
index 6e5bd5324..a288afead 100644
--- a/xc/programs/Xserver/include/dixfont.h
+++ b/xc/programs/Xserver/include/dixfont.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dixfont.h,v 1.19 94/03/18 12:25:38 dpw Exp $ */
+/* $XConsortium: dixfont.h,v 1.20 94/04/17 20:25:38 dpw Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/Xserver/include/dixfontstr.h b/xc/programs/Xserver/include/dixfontstr.h
index 94db1e737..280020410 100644
--- a/xc/programs/Xserver/include/dixfontstr.h
+++ b/xc/programs/Xserver/include/dixfontstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dixfontstr.h,v 1.14 94/02/23 15:47:19 dpw Exp $ */
+/* $XConsortium: dixfontstr.h,v 1.15 94/04/17 20:25:39 dpw Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/Xserver/include/dixstruct.h b/xc/programs/Xserver/include/dixstruct.h
index db5b91020..426b33637 100644
--- a/xc/programs/Xserver/include/dixstruct.h
+++ b/xc/programs/Xserver/include/dixstruct.h
@@ -20,7 +20,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: dixstruct.h,v 1.32 94/03/18 12:25:41 dpw Exp $ */
+/* $XConsortium: dixstruct.h,v 1.33 94/04/17 20:25:40 dpw Exp $ */
#ifndef DIXSTRUCT_H
#define DIXSTRUCT_H
diff --git a/xc/programs/Xserver/include/extension.h b/xc/programs/Xserver/include/extension.h
index d6a3294ba..b0647d6f4 100644
--- a/xc/programs/Xserver/include/extension.h
+++ b/xc/programs/Xserver/include/extension.h
@@ -1,4 +1,4 @@
-/* $XConsortium: extension.h,v 1.7 94/02/23 15:47:22 dpw Exp $ */
+/* $XConsortium: extension.h,v 1.8 94/04/17 20:25:41 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/extnsionst.h b/xc/programs/Xserver/include/extnsionst.h
index 696013245..1f3568559 100644
--- a/xc/programs/Xserver/include/extnsionst.h
+++ b/xc/programs/Xserver/include/extnsionst.h
@@ -1,4 +1,4 @@
-/* $XConsortium: extnsionst.h,v 1.13 94/02/23 15:47:24 dpw Exp $ */
+/* $XConsortium: extnsionst.h,v 1.14 94/04/17 20:25:42 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/gc.h b/xc/programs/Xserver/include/gc.h
index 544385e61..150805880 100644
--- a/xc/programs/Xserver/include/gc.h
+++ b/xc/programs/Xserver/include/gc.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: gc.h,v 1.58 94/03/18 12:25:42 dpw Exp $ */
+/* $XConsortium: gc.h,v 1.59 94/04/17 20:25:43 dpw Exp $ */
#ifndef GC_H
#define GC_H
diff --git a/xc/programs/Xserver/include/gcstruct.h b/xc/programs/Xserver/include/gcstruct.h
index 44cdc6fca..34fa94314 100644
--- a/xc/programs/Xserver/include/gcstruct.h
+++ b/xc/programs/Xserver/include/gcstruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: gcstruct.h,v 5.9 94/03/18 12:25:44 dpw Exp $ */
+/* $XConsortium: gcstruct.h,v 5.10 94/04/17 20:25:45 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/input.h b/xc/programs/Xserver/include/input.h
index 38698095a..0d1a2ed17 100644
--- a/xc/programs/Xserver/include/input.h
+++ b/xc/programs/Xserver/include/input.h
@@ -1,4 +1,4 @@
-/* $XConsortium: input.h,v 1.17 94/04/17 20:25:46 frob Exp $ */
+/* $XConsortium: input.h,v 1.18 94/08/16 13:44:42 dpw Exp $ */
/************************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/inputstr.h b/xc/programs/Xserver/include/inputstr.h
index 6792fe93e..a4b448c25 100644
--- a/xc/programs/Xserver/include/inputstr.h
+++ b/xc/programs/Xserver/include/inputstr.h
@@ -46,7 +46,7 @@ SOFTWARE.
********************************************************/
-/* $XConsortium: inputstr.h,v 1.33 94/02/03 18:59:02 rws Exp $ */
+/* $XConsortium: inputstr.h,v 1.34 94/04/17 20:25:47 rws Exp $ */
#ifndef INPUTSTRUCT_H
#define INPUTSTRUCT_H
diff --git a/xc/programs/Xserver/include/message.h b/xc/programs/Xserver/include/message.h
deleted file mode 100644
index 25fbb8488..000000000
--- a/xc/programs/Xserver/include/message.h
+++ /dev/null
@@ -1,176 +0,0 @@
-
-/************************************************************************
- *
- * message.h --
- *
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- ************************************************************************/
-
-/* $XConsortium: message.h,v 1.5 93/12/16 10:38:57 rob Exp $ */
-
-#ifndef _message_h
-#define _message_h
-
-
-#include "Xmd.h"
-
-
-typedef enum
- {
- reply_message,
- event_message,
- error_message
- } MessageType;
-
-
-typedef struct _PooledMessage
- {
- union
- {
- char reply[32];
- char error[32];
- char event[32];
- int replySize;
- } un;
-
- MessageType type;
- char *pLargeReply;
- char *pReplyData;
- int lenReplyData;
- Bool freeReplyData;
- struct _PooledMessage *next;
- struct _PoolPage *page;
- } PooledMessageRec, *PooledMessagePtr;
-
-typedef struct _PoolPage
- {
- int numAvail;
- int numPerPage;
- PooledMessagePtr avail;
- struct _PoolPage *nextPage;
- struct _PoolPage *prevPage;
- } PoolPageRec, *PoolPagePtr;
-
-typedef struct _ClientMessageHeader
- {
- int client_index;
- PooledMessagePtr head;
- PooledMessagePtr tail;
- struct _ClientMessageHeader *next;
- } ClientMsgHeaderRec, *ClientMsgHeaderPtr;
-
-typedef struct
- {
- ClientMsgHeaderRec forClient[MAXCLIENTS];
- ClientMsgHeaderPtr first;
- } MsgBufferRec, *MsgBufferPtr;
-
-#define GetPooledMessage() (GetPooledMessages(1))
-
-
-/***********************************************************************
- *
- * STX to MTX merge versions of ReturnPooledMessage
- *
- ***********************************************************************/
-#define ReturnPooledMessage(p) (ReturnPooledMessages(p))
-
-#ifdef XTHREADS
-#define MTXReturnPooledMessage ReturnPooledMessage(msg)
-#else
-#define MTXReturnPooledMessage /* nothing */
-#endif
-
-
-#define GetReplyMessage(t, p) ((t *)GetPooledReplyMessage(sizeof(t), p))
-
-#define GetReplyPointer(t, m) ((t *)(m->pLargeReply?m->pLargeReply:m->un.reply))
-#define GetEventPointer(t, m) ((t *)(m->un.event))
-#define GetErrorPointer(t, m) ((t *)(m->un.error))
-
-/***********************************************************************
- *
- * Transfer any local messages to the global buffer.
- *
- ***********************************************************************/
-
-#define TRANSFER_LOCAL_MESSAGES_TO_GLOBAL(client) \
-{ \
- register MsgBufferPtr localMsgBuffer; \
- \
- if (!client->clientGone) \
- { \
- localMsgBuffer = (MsgBufferPtr) client->msgBuffer; \
- if (localMsgBuffer->first) \
- { \
- TransferLocalMessagesToGlobal(localMsgBuffer); \
- } \
- } \
-}
-/***********************************************************************
- *
- * Merge MTX with STX, cover the GetReplyMessage macro.
- *
- * I don't see any other way of impelementing this. I don't know, but
- * there may be something left in the client structure that indicates
- * if it is locked.
- *
- * See mtxlock.h for the MTX_UNLOCK_* macros.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTXGetReplyMessage(mapping, rep, repRec, MTX_UNLOCK_SOMETHING) \
- if (!(rep = GetReplyMessage (mapping, msg ))) \
- { \
- MTX_UNLOCK_SOMETHING; \
- return BadAlloc; \
- }
-#else
-#define MTXGetReplyMessage(mapping, rep, repRec, MTX_UNLOCK_SOMETHING) \
-{ \
- rep = &repRec; \
-}
-#endif
-
-
-extern PooledMessagePtr GetPooledMessages();
-extern char *GetPooledReplyMessage();
-extern void ReturnPooledMessages();
-extern int InitializeMessageMonitor();
-extern void CleanupMessageMonitor();
-extern MsgBufferPtr RegisterLocalMessageBufferForThread();
-extern void UnregisterLocalMessageBufferForThread();
-extern void TransferLocalMessagesToGlobal();
-extern void AllowEventTimestampUpdates();
-extern void SendReplyToClient();
-extern void WriteEventsToClient();
-extern void SendErrorToClient();
-extern void FlushAllMessages();
-extern void GrabClientMessageDelivery();
-extern void UngrabClientMessageDelivery();
-extern void WriteReplyDataToGrabbedClient();
-extern void SendConnectionSetupInfo();
-
-#endif
diff --git a/xc/programs/Xserver/include/misc.h b/xc/programs/Xserver/include/misc.h
index 02f50120b..85f4551f0 100644
--- a/xc/programs/Xserver/include/misc.h
+++ b/xc/programs/Xserver/include/misc.h
@@ -66,7 +66,7 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS SOFTWARE.
******************************************************************/
-/* $XConsortium: misc.h,v 1.68 94/04/17 20:25:48 dpw Exp $ */
+/* $XConsortium: misc.h,v 1.69 95/03/03 01:54:22 dpw Exp $ */
#ifndef MISC_H
#define MISC_H 1
/*
diff --git a/xc/programs/Xserver/include/miscstruct.h b/xc/programs/Xserver/include/miscstruct.h
index 706475cb9..525df07e2 100644
--- a/xc/programs/Xserver/include/miscstruct.h
+++ b/xc/programs/Xserver/include/miscstruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miscstruct.h,v 5.4 94/02/16 11:51:26 dpw Exp $ */
+/* $XConsortium: miscstruct.h,v 5.5 94/04/17 20:25:50 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/mtxlock.h b/xc/programs/Xserver/include/mtxlock.h
deleted file mode 100644
index b683342f7..000000000
--- a/xc/programs/Xserver/include/mtxlock.h
+++ /dev/null
@@ -1,1045 +0,0 @@
-
-/************************************************************************
- *
- * mtxlock.h --
- *
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- ************************************************************************/
-
-/* $XConsortium: mtxlock.h,v 1.11 94/01/11 20:54:52 rob Exp $ */
-
-#ifndef MTXLOCK_H
-#define MTXLOCK_H
-
-#include "X.h"
-#include "windowstr.h"
-#include "gc.h"
-#include "pixmapstr.h"
-#include "regionstr.h"
-#include "message.h"
-#include "conflict.h"
-#include "xthreads.h"
-#include "resource.h"
-#include "POQ.h"
-
-#ifndef XTHREADS
-#define MTX_REP_LOCK_DEVICES() /* nothing */
-#define MTX_LOCK_DEVICES() /* nothing */
-#define MTX_UNLOCK_DEVICES() /* nothing */
-#else /* XTHREADS */
-#define MTX_REP_LOCK_DEVICES() LockDevices()
-#define MTX_LOCK_DEVICES() LockDevices()
-#define MTX_UNLOCK_DEVICES() UnlockDevices()
-#endif /* XTHREADS */
-
-#ifndef XTHREADS
-#define MTX_MUTEX_LOCK(_arg) /* nothing */
-#define MTX_MUTEX_UNLOCK(_arg) /* nothing */
-#else /* XTHREADS */
-#define MTX_MUTEX_LOCK(_arg) X_MUTEX_LOCK(_arg)
-#define MTX_MUTEX_UNLOCK(_arg) X_MUTEX_UNLOCK(_arg)
-#endif /* XTHREADS */
-
-/***********************************************************************
- *
- * Lock and validate a drawable and GC.
- *
- ***********************************************************************/
-
-#define LOCK_AND_VALIDATE_DRAWABLE_AND_GC(pDraw, pGC, drawID, gcID, client)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyDrawableAndGC (&(pDraw), &(pGC), (drawID),\
- (gcID), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_RENDER_CONFLICT((client), (pDraw), (pGC)); \
- \
- POQLock((client), (CM_XRender)); \
- \
- if ((pGC)->serialNumber != (pDraw)->serialNumber) \
- { \
- ValidateGC((pDraw), (pGC)); \
- } \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Lock and validate a drawable and GC.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_LOCK_AND_VALIDATE_DRAWABLE_AND_GC LOCK_AND_VALIDATE_DRAWABLE_AND_GC
-#else
-#define MTX_LOCK_AND_VALIDATE_DRAWABLE_AND_GC(pDraw, pGC, drawID, gcID, client)\
-{ \
- VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client); \
-}
-#endif
-
-/***********************************************************************
- *
- * Unlock a drawable and GC.
- *
- ***********************************************************************/
-
-#define UNLOCK_DRAWABLE_AND_GC(pDraw, pGC, drawID, gcID, client) \
-{ \
- POQUnlock((client)); \
- UnlockDrawableAndGC ((pDraw), (pGC), (drawID), (gcID)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Unlock a drawable and GC.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_DRAWABLE_AND_GC UNLOCK_DRAWABLE_AND_GC
-#else
-#define MTX_UNLOCK_DRAWABLE_AND_GC /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Lock and validate two drawables and GC. If the srcID and dstID
- * drawable ID's are the same, then only one drawable needs to be locked.
- *
- ***********************************************************************/
-
-#define LOCK_AND_VALIDATE_TWO_DRAWABLES_AND_GC(pSrc, pDst, pGC, srcID, dstID, gcID, client) \
-{ \
- int _error; \
- \
- if ((srcID) == (dstID)) \
- { \
- if (_error = LockAndVerifyDrawableAndGC (&(pDst), &(pGC), \
- (dstID), (gcID), (client))) \
- { \
- return (_error); \
- } \
- (pSrc) = (pDst); \
- \
- POQ_SET_RENDER_CONFLICT((client), (pDst), (pGC)); \
- } \
- else \
- { \
- if (_error = LockAndVerifyTwoDrawablesAndGC (&(pSrc), &(pDst), \
- &(pGC), (srcID), (dstID), (gcID), (client))) \
- { \
- return (_error); \
- } \
- \
- if ((pSrc->type == DRAWABLE_WINDOW) && \
- (pDst->type == DRAWABLE_WINDOW)) \
- { \
- POQ_SET_ALL_CONFLICT((client)); \
- } \
- else if (pSrc->type == DRAWABLE_WINDOW) \
- { \
- POQ_SET_RENDER_CONFLICT((client), (pSrc), (pGC)); \
- } \
- else if (pDst->type == DRAWABLE_WINDOW) \
- { \
- POQ_SET_RENDER_CONFLICT((client), (pDst), (pGC)); \
- } \
- else /* both are pixmaps */ \
- { \
- POQ_SET_NULL_CONFLICT((client)); \
- } \
- } \
- \
- POQLock((client), (CM_XRender)); \
- \
- if ((pGC)->serialNumber != (pDst)->serialNumber) \
- { \
- ValidateGC((pDst), (pGC)); \
- } \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Lock and validate two drawables and GC.
- * If the srcID and dstID drawable ID's are the same, then only one
- * drawable needs to be locked.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_LOCK_AND_VALIDATE_TWO_DRAWABLES_AND_GC LOCK_AND_VALIDATE_TWO_DRAWABLES_AND_GC
-#else
-#define MTX_LOCK_AND_VALIDATE_TWO_DRAWABLES_AND_GC(pSrc, pDst, pGC, srcID, dstID, gcID, client)\
-{ \
- VALIDATE_DRAWABLE_AND_GC(dstID, pDst, pGC, client); \
- if (dstID != srcID) \
- { \
- VERIFY_DRAWABLE(pSrc, srcID, client); \
- if (pDst->pScreen != pSrc->pScreen) \
- { \
- client->errorValue = dstID; \
- return (BadMatch); \
- } \
- } \
- else \
- { \
- pSrc = pDst; \
- } \
-}
-#endif
-
-/***********************************************************************
- *
- * Unock two drawables and a GC. If the srcID and dstID drawable ID's
- * are the same, then only one drawable was locked.
- *
- ***********************************************************************/
-
-#define UNLOCK_TWO_DRAWABLES_AND_GC(pSrc, pDst, pGC, srcID, dstID, gcID, client)\
-{ \
- POQUnlock((client)); \
- \
- if ((srcID) == (dstID)) \
- { \
- UnlockDrawableAndGC ((pDst), (pGC), (dstID), (gcID)); \
- } \
- else \
- { \
- UnlockTwoDrawablesAndGC ((pSrc), (pDst), (pGC), (srcID), \
- (dstID), (gcID)); \
- } \
-}
-/***********************************************************************
- *
- * STX to MTX merge Unlock two drawables and a GC. If the srcID and dstID
- * drawable ID's are the same, then only one drawable was locked.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_TWO_DRAWABLES_AND_GC UNLOCK_TWO_DRAWABLES_AND_GC
-#else
-#define MTX_UNLOCK_TWO_DRAWABLES_AND_GC(pSrc, pDst, pGC, srcID, dstID, gcID, client) \
- /* nothing */
-#endif
-
-
-
-/***********************************************************************
- *
- * Lock and verify a window.
- *
- * STX to MTX merge versions of Lock and verify a window.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_REP_LOCK_AND_VERIFY_WINDOW(pWin, winID, client, regionType, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyWindow(&(pWin), (winID), (client))) \
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- POQ_SET_WINDOW_CONFLICT((client), (pWin), (regionType)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_WINDOW(pWin, winID, client, regionType, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyWindow(&(pWin), (winID), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_WINDOW_CONFLICT((client), (pWin), (regionType)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_AND_VERIFY_WINDOW MTX_LOCK_AND_VERIFY_WINDOW
-#define MTX_LOCK_AND_VERIFY_WINDOW(pWin, winID, client, regionType, conflictMask)\
-{ \
- if (!(pWin = (WindowPtr)LookupWindow(winID, client))) \
- return BadWindow; \
-}
-#endif
-
-
-/***********************************************************************
- *
- * Unlock a window.
- *
- ***********************************************************************/
-
-#define UNLOCK_WINDOW(pWin, winID, client) \
-{ \
- POQUnlock((client)); \
- UnlockWindow ((pWin), (winID)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Unlock a window.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_WINDOW UNLOCK_WINDOW
-#else
-#define MTX_UNLOCK_WINDOW(pWin, winID, client) /* nothing */
-#endif
-
-#define MTX_UNLOCK_WINDOW_IF_FAILURE(pWin, whatStuff,client) \
- MTX_UNLOCK_WINDOW(pWin,whatStuff,client);
-
-#define MTX_UNLOCK_DRAWABLE_IF_FAILURE(pDraw, drawID, client) \
- MTX_UNLOCK_DRAWABLE(pDraw, drawID, client);
-
-#define MTX_UNLOCK_DEVICE_IF_FAILURE(client) \
- UnlockDevicesAndPOQ(client);
-
-#define MTX_UNLOCK_POQ_IF_FAILURE(client) \
- UNLOCK_PENDING_OPERATION_QUEUE(client);
-
-#define MTX_UNLOCK_ALL_WINDOWS_IF_FAILURE(pwin, pdst, stuffSrc, stuffDst, client)\
- MTX_UNLOCK_ALL_WINDOWS(pwin, pdst, stuffSrc, stuffDst, client)
-
-#define MTX_UNLOCK_FONT_IF_FAILURE(pFont, fontID, client) \
- MTX_UNLOCK_FONT(pFont, stuff->fid, client) \
-
-#define MTX_UNLOCK_COLORMAP_IF_FAILURE(pmap, cmapID, client) \
- MTX_UNLOCK_COLORMAP(pmap, cmapID, client)
-
-
-/***********************************************************************
- *
- * Lock and verify one or two windows.
- *
- * STX to MTX merge versions for Lock and verify one or two windows.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_REP_LOCK_AND_VERIFY_ALL_WINDOWS(pWin1, pWin2, winID1, winID2, client, regionType, conflictMask)\
-{ \
- int _error; \
- \
- if ((winID1) && (winID2)) \
- { \
- if (_error = LockAndVerifyTwoWindows(&(pWin1), &(pWin2), \
- (winID1), (winID2), (client))) \
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- POQ_SET_ALL_CONFLICT((client)); \
- } \
- else if ((winID1)) \
- { \
- if (_error = LockAndVerifyWindow(&(pWin1), (winID1), (client))) \
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- (pWin2) = NullWindow; \
- POQ_SET_WINDOW_CONFLICT((client), (pWin1), (regionType)); \
- } \
- else if ((winID2)) \
- { \
- if (_error = LockAndVerifyWindow(&(pWin2), (winID2), (client))) \
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- (pWin1) = NullWindow; \
- POQ_SET_WINDOW_CONFLICT((client), (pWin2), (regionType)); \
- } \
- else \
- { \
- (pWin1) = NullWindow; \
- (pWin2) = NullWindow; \
- POQ_SET_NULL_CONFLICT((client)); \
- } \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_ALL_WINDOWS(pWin1, pWin2, winID1, winID2, client, regionType, conflictMask)\
-{ \
- int _error; \
- \
- if ((winID1) && (winID2)) \
- { \
- if (_error = LockAndVerifyTwoWindows(&(pWin1), &(pWin2), \
- (winID1), (winID2), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_ALL_CONFLICT((client)); \
- } \
- else if ((winID1)) \
- { \
- if (_error = LockAndVerifyWindow(&(pWin1), (winID1), (client))) \
- { \
- return (_error); \
- } \
- (pWin2) = NullWindow; \
- POQ_SET_WINDOW_CONFLICT((client), (pWin1), (regionType)); \
- } \
- else if ((winID2)) \
- { \
- if (_error = LockAndVerifyWindow(&(pWin2), (winID2), (client))) \
- { \
- return (_error); \
- } \
- (pWin1) = NullWindow; \
- POQ_SET_WINDOW_CONFLICT((client), (pWin2), (regionType)); \
- } \
- else \
- { \
- (pWin1) = NullWindow; \
- (pWin2) = NullWindow; \
- POQ_SET_NULL_CONFLICT((client)); \
- } \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_AND_VERIFY_ALL_WINDOWS MTX_LOCK_AND_VERIFY_ALL_WINDOWS
-#define MTX_LOCK_AND_VERIFY_ALL_WINDOWS(pWin1, pWin2, winID1, winID2, client, regionType, conflictMask)\
-{ \
- if ((winID1)) \
- { \
- if (!(pWin1 = (WindowPtr)LookupWindow(winID1, client))) \
- return BadWindow; \
- } \
- else \
- (pWin1) = NullWindow; \
- \
- if ((winID2)) \
- { \
- if (!(pWin2 = (WindowPtr)LookupWindow(winID2, client))) \
- return BadWindow; \
- } \
- else \
- (pWin2) = NullWindow; \
-}
-#endif
-
-
-
-/***********************************************************************
- *
- * Unlock any windows that are currently locked (pWin1 and/or pWin2).
- *
- ***********************************************************************/
-
-#define UNLOCK_ALL_WINDOWS(pWin1, pWin2, winID1, winID2, client) \
-{ \
- POQUnlock((client)); \
- \
- if ((pWin1) && (pWin2)) \
- { \
- UnlockTwoWindows ((pWin1), (pWin2), (winID1), (winID2)); \
- } \
- else if ((pWin1)) \
- { \
- UnlockWindow ((pWin1), (winID1)); \
- } \
- else if ((pWin2)) \
- { \
- UnlockWindow ((pWin2), (winID2)); \
- } \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Unlock any windows that are currently locked
- * (pWin1 and/or pWin2).
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_ALL_WINDOWS UNLOCK_ALL_WINDOWS
-#else
-#define MTX_UNLOCK_ALL_WINDOWS(pWin1, pWin2, winID1, winID2, client) \
- /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify a drawable. Return a BadMatch error if the drawable
- * is a UNDRAWABLE_WINDOW.
- *
- * STX to MTX merge versions of Lock and verify a drawable. Return a
- * BadMatch error if the drawable is a UNDRAWABLE_WINDOW.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_REP_LOCK_AND_VERIFY_DRAWABLE(pDraw, drawID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyDrawable(&(pDraw), (drawID), (client), TRUE))\
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- POQ_SET_DRAWABLE_CONFLICT((client), (pDraw)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_DRAWABLE(pDraw, drawID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyDrawable(&(pDraw), (drawID), (client), TRUE))\
- { \
- return (_error); \
- } \
- POQ_SET_DRAWABLE_CONFLICT((client), (pDraw)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_AND_VERIFY_DRAWABLE MTX_LOCK_AND_VERIFY_DRAWABLE
-#define MTX_LOCK_AND_VERIFY_DRAWABLE(pDraw, stuffDrawable, client, conflictMask)\
- VERIFY_DRAWABLE(pDraw, stuffDrawable, client)
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify a (geomtrable) drawable.
- *
- * STX to MTX merge version of Lock and verify a ?geometrable.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_REP_LOCK_AND_VERIFY_GEOMETRABLE(pDraw, drawID, client, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyDrawable(&(pDraw), (drawID), (client), FALSE))\
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- POQ_SET_DRAWABLE_CONFLICT((client), (pDraw)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_GEOMETRABLE(pDraw, drawID, client, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyDrawable(&(pDraw), (drawID), (client), FALSE))\
- { \
- return (_error); \
- } \
- POQ_SET_DRAWABLE_CONFLICT((client), (pDraw)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_AND_VERIFY_GEOMETRABLE MTX_LOCK_AND_VERIFY_GEOMETRABLE
-#define MTX_LOCK_AND_VERIFY_GEOMETRABLE(pDraw, drawID, client, conflictMask)\
- VERIFY_GEOMETRABLE(pDraw, drawID, client);
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify a pixmap.
- *
- ***********************************************************************/
-
-#define LOCK_AND_VERIFY_PIXMAP(pPixmap, pixmapID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyPixmap(&(pPixmap), (pixmapID), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge Lock and verify a pixmap.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_LOCK_AND_VERIFY_PIXMAP LOCK_AND_VERIFY_PIXMAP
-#else
-#define MTX_LOCK_AND_VERIFY_PIXMAP(pMap, pixID, client, CM_XFreePixmap) \
-{ \
- if(!(pMap = (PixmapPtr)LookupIDByType(pixID, RT_PIXMAP))) \
- { \
- client->errorValue = pixID; \
- return (BadPixmap); \
- } \
-}
-#endif
-
-
-/***********************************************************************
- *
- * Unlock a drawable.
- *
- ***********************************************************************/
-
-#define UNLOCK_DRAWABLE(pDraw, drawID, client) \
-{ \
- POQUnlock((client)); \
- UnlockDrawable((pDraw), (drawID)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of UNLOCK_DRAWABLE macro.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_DRAWABLE UNLOCK_DRAWABLE
-#else
-#define MTX_UNLOCK_DRAWABLE(pDraw, drawID, client) /* nothing */
-#endif
-/***********************************************************************
- *
- * STX to MTX merge: Cover-up up the call to the function UnlockDrawable
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTXUnlockDrawable(drawablePtr, id) UnlockDrawable(drawablePtr, id)
-#else
-#define MTXUnlockDrawable(drawablePtr, id) /* nothing */
-#endif
-
-
-
-
-/***********************************************************************
- *
- * Lock and verify a GC.
- *
- ***********************************************************************/
-
-#define LOCK_AND_VERIFY_GC(pGC, gcID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyGC(&(pGC), (gcID), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Lock and verify a GC.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_LOCK_AND_VERIFY_GC LOCK_AND_VERIFY_GC
-#else
-#define MTX_LOCK_AND_VERIFY_GC(pGC, stuffGC, client, conflictMask) \
- VERIFY_GC(pGC, stuffGC, client)
-#endif
-
-
-/***********************************************************************
- *
- * Unlock a GC.
- *
- ***********************************************************************/
-
-#define UNLOCK_GC(pGC, gcID, client) \
-{ \
- POQUnlock((client)); \
- UnlockGC ((pGC), (gcID)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Unlock a GC.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_GC UNLOCK_GC
-#else
-#define MTX_UNLOCK_GC(pGC, gcID, client) /* nothing */
-#endif
-/***********************************************************************
- *
- * STX to MTX Cover-up when calls are made directly to the UnlockGC func.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTXUnlockGC(pGC, gcID) UnlockGC (pGC, gcID)
-#else
-#define MTXUnlockGC(pGC, gcID) /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify two GCs.
- *
- ***********************************************************************/
-
-#define LOCK_AND_VERIFY_TWO_GCS(pGC1, pGC2, gcID1, gcID2, client, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyTwoGCs(&(pGC1), &(pGC2), (gcID1), (gcID2),\
- (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Lock and verify two GCs.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_LOCK_AND_VERIFY_TWO_GCS LOCK_AND_VERIFY_TWO_GCS
-#else
-#define MTX_LOCK_AND_VERIFY_TWO_GCS(pGC1, pGC2, gcID1, gcID2, client, conflictMask) \
- VERIFY_GC(pGC1, gcID1, client); \
- VERIFY_GC(pGC2, gcID2, client)
-#endif
-
-
-/***********************************************************************
- *
- * Unlock two GCs.
- *
- ***********************************************************************/
-
-#define UNLOCK_TWO_GCS(pGC1, pGC2, gcID1, gcID2, client) \
-{ \
- POQUnlock((client)); \
- UnlockTwoGCs ((pGC1), (pGC2), (gcID1), (gcID2)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Unlock two GCs.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_TWO_GCS UNLOCK_TWO_GCS
-#else
-#define MTX_UNLOCK_TWO_GCS(pGC1, pGC2, gcID1, gcID2, client) /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify a colormap.
- *
- * STX to MTX merge version of Lock and verify a colormap.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_REP_LOCK_AND_VERIFY_COLORMAP(pMap, mapID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyColormap(&(pMap), (mapID), (client))) \
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_COLORMAP(pMap, mapID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyColormap(&(pMap), (mapID), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_AND_VERIFY_COLORMAP MTX_LOCK_AND_VERIFY_COLORMAP
-#define MTX_LOCK_AND_VERIFY_COLORMAP(pMap, mapID, client, conflictMask) \
-{ \
- pMap = (ColormapPtr )LookupIDByType(mapID, RT_COLORMAP); \
- if (!pMap) \
- { \
- client->errorValue = mapID; \
- return (BadColor); \
- } \
-}
-#endif
-
-
-/***********************************************************************
- *
- * Unlock a colormap.
- *
- ***********************************************************************/
-
-#define UNLOCK_COLORMAP(pMap, mapID, client) \
-{ \
- POQUnlock((client)); \
- UnlockColormap ((pMap), (mapID)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge versions of Unlock a colormap.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_COLORMAP UNLOCK_COLORMAP
-#else
-#define MTX_UNLOCK_COLORMAP(pMap, mapID, client) /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify a font.
- *
- ***********************************************************************/
-
-#define LOCK_AND_VERIFY_FONT(pFont, fontID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyFont(&(pFont), (fontID), (client), FALSE))\
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-
-/***********************************************************************
- *
- * Lock and verify a font. If the font is not in the RDB, try to
- * lookup the GC containing the font.
- *
- ***********************************************************************/
-
-/***********************************************************************
- *
- * STX to MTX merge versions of Lock and verify a font. If the font is
- * not in the RDB, try to lookup the GC containing the font.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_REP_LOCK_AND_VERIFY_GC_FONT(pFont, pGC, fontID, client, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyFont(&(pFont), (fontID), (client), TRUE)) \
- { \
- MTXReturnPooledMessage; \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_GC_FONT(pFont, pGC, fontID, client, conflictMask)\
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyFont(&(pFont), (fontID), (client), TRUE)) \
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_AND_VERIFY_GC_FONT MTX_LOCK_AND_VERIFY_GC_FONT
-#define MTX_LOCK_AND_VERIFY_GC_FONT(pFont, pGC, fontID, client, conflictMask)\
-{ \
- pFont = (FontPtr)LookupIDByType(fontID, RT_FONT); \
- if (!pFont) \
- { \
- /* can't use VERIFY_GC because it might return BadGC */ \
- pGC = (GC *) LookupIDByType(fontID, RT_GC); \
- if (!pGC) \
- { \
- client->errorValue = fontID; \
- return(BadFont); /* procotol spec says only error is BadFont */\
- } \
- pFont = pGC->font; \
- } \
-}
-#endif
-
-
-/***********************************************************************
- *
- * Unlock a font.
- *
- ***********************************************************************/
-
-#define UNLOCK_FONT(pFont, fontID, client) \
-{ \
- POQUnlock((client)); \
- UnlockFont ((pFont), (fontID)); \
-}
-/***********************************************************************
- *
- * STX to MTX merge version of Unlock a font.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_FONT UNLOCK_FONT
-#else
-#define MTX_UNLOCK_FONT(pFont, fontID, client) /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Lock and verify a cursor.
- *
- * STX to MTX merge versions of Lock and verify a cursor.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_DEV_LOCK_AND_VERIFY_CURSOR(pCursor, cursorID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyCursor(&(pCursor), (cursorID), (client))) \
- { \
- MTX_UNLOCK_DEVICES(); \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#define MTX_LOCK_AND_VERIFY_CURSOR(pCursor, cursorID, client, conflictMask) \
-{ \
- int _error; \
- \
- if (_error = LockAndVerifyCursor(&(pCursor), (cursorID), (client))) \
- { \
- return (_error); \
- } \
- POQ_SET_NULL_CONFLICT((client)); \
- \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_DEV_LOCK_AND_VERIFY_CURSOR MTX_LOCK_AND_VERIFY_CURSOR
-#define MTX_LOCK_AND_VERIFY_CURSOR(pCursor, cursorID, client, conflictMask)\
-{ \
- pCursor = (CursorPtr)LookupIDByType(cursorID, RT_CURSOR); \
- if (!pCursor) \
- { \
- client->errorValue = stuff->id; \
- return (BadCursor); \
- } \
-}
-#endif
-
-
-/***********************************************************************
- *
- * Unlock a cursor.
- *
- ***********************************************************************/
-
-#define UNLOCK_CURSOR(pCursor, cursorID, client) \
-{ \
- POQUnlock((client)); \
- UnlockCursor ((pCursor), (cursorID)); \
-}
-
-/***********************************************************************
- *
- * Lock the pending operation queue.
- *
- * STX to MTX versions of Lock the pending operation queue.
- *
- ***********************************************************************/
-
-#ifdef XTHREADS
-/* no return - _REP version same as without */
-#define MTX_REP_LOCK_PENDING_OPERATION_QUEUE MTX_LOCK_PENDING_OPERATION_QUEUE
-#define MTX_LOCK_PENDING_OPERATION_QUEUE(client, conflictMask) \
-{ \
- POQ_SET_ALL_CONFLICT((client)); \
- POQLock((client), (conflictMask)); \
-}
-#else
-#define MTX_REP_LOCK_PENDING_OPERATION_QUEUE MTX_LOCK_PENDING_OPERATION_QUEUE
-#define MTX_LOCK_PENDING_OPERATION_QUEUE(client, conflictMask) /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Unlock the pending operation queue.
- *
- ***********************************************************************/
-
-#define UNLOCK_PENDING_OPERATION_QUEUE(client) \
-{ \
- POQUnlock((client)); \
-}
-/***********************************************************************
- *
- * STX to MTX versions of Unlock the pending operation queue.
- *
- ***********************************************************************/
-#ifdef XTHREADS
-#define MTX_UNLOCK_PENDING_OPERATION_QUEUE UNLOCK_PENDING_OPERATION_QUEUE
-#else
-#define MTX_UNLOCK_PENDING_OPERATION_QUEUE(client) /* nothing */
-#endif
-
-
-/***********************************************************************
- *
- * Check to see if a render operation needs to come up for air.
- *
- ***********************************************************************/
-
-#define MAYBE_COME_UP_FOR_AIR() \
-{ \
- POQComeUpForAir(); \
-}
-
-/***********************************************************************/
-
-#endif /* MTXLOCK_H */
diff --git a/xc/programs/Xserver/include/opaque.h b/xc/programs/Xserver/include/opaque.h
index 5cc101db1..1a0cc522b 100644
--- a/xc/programs/Xserver/include/opaque.h
+++ b/xc/programs/Xserver/include/opaque.h
@@ -1,4 +1,4 @@
-/* $XConsortium: opaque.h,v 1.18 94/04/12 17:23:05 dpw Exp $ */
+/* $XConsortium: opaque.h,v 1.19 94/04/17 20:25:51 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/os.h b/xc/programs/Xserver/include/os.h
index db5f0609c..12f2beaed 100644
--- a/xc/programs/Xserver/include/os.h
+++ b/xc/programs/Xserver/include/os.h
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: os.h,v 1.66 95/04/07 20:33:29 kaleb Exp $ */
+/* $XConsortium: os.h,v 1.67 95/04/25 20:32:58 dpw Exp $ */
#ifndef OS_H
#define OS_H
diff --git a/xc/programs/Xserver/include/pixmap.h b/xc/programs/Xserver/include/pixmap.h
index 00f7f8f11..5fdc2d09c 100644
--- a/xc/programs/Xserver/include/pixmap.h
+++ b/xc/programs/Xserver/include/pixmap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pixmap.h,v 5.5 93/07/12 09:44:49 dpw Exp $ */
+/* $XConsortium: pixmap.h,v 5.6 94/04/17 20:25:53 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/pixmapstr.h b/xc/programs/Xserver/include/pixmapstr.h
index 763f722ec..d9bfc74f3 100644
--- a/xc/programs/Xserver/include/pixmapstr.h
+++ b/xc/programs/Xserver/include/pixmapstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: pixmapstr.h,v 5.5 94/03/18 12:25:49 dpw Exp $ */
+/* $XConsortium: pixmapstr.h,v 5.6 94/04/17 20:25:54 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/property.h b/xc/programs/Xserver/include/property.h
index 0609d2230..2c039c53b 100644
--- a/xc/programs/Xserver/include/property.h
+++ b/xc/programs/Xserver/include/property.h
@@ -1,4 +1,4 @@
-/* $XConsortium: property.h,v 1.4 93/09/20 16:52:51 dpw Exp $ */
+/* $XConsortium: property.h,v 1.5 94/04/17 20:25:55 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/propertyst.h b/xc/programs/Xserver/include/propertyst.h
index e9ca43921..e1b09eeb3 100644
--- a/xc/programs/Xserver/include/propertyst.h
+++ b/xc/programs/Xserver/include/propertyst.h
@@ -1,4 +1,4 @@
-/* $XConsortium: propertyst.h,v 1.4 94/02/20 10:38:48 dpw Exp $ */
+/* $XConsortium: propertyst.h,v 1.5 94/04/17 20:25:56 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/pthread.h b/xc/programs/Xserver/include/pthread.h
deleted file mode 100644
index 0520735cf..000000000
--- a/xc/programs/Xserver/include/pthread.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/*
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- */
-
-#ifdef USE_MONITER_XTHREADS
-#include <mach.h>
-#endif
-
-#include <cthreads.h>
-
-#define PTHREAD_PROCSYNC 1
-#define PTHREAD_PROCASYNC 2
-
-#define PTHREAD_INTR_ENABLE 1
-#define PTHREAD_INTR_DISABLE 2
-
-#define pthread_attr_default 3
-#define pthread_mutexattr_default 4
-#define pthread_condattr_default 3
-
-
-#define pthread_t cthread_t
-#define pthread_attr_t int
-#define pthread_mutexattr_t int
-#define pthread_condattr_t int
-#define pthread_mutex_t struct mutex
-#define pthread_cond_t struct condition
-#define pthread_key_t int
-
-#define DATAKEYS_MAX 5
diff --git a/xc/programs/Xserver/include/region.h b/xc/programs/Xserver/include/region.h
index 852d9f9cd..b12de29fa 100644
--- a/xc/programs/Xserver/include/region.h
+++ b/xc/programs/Xserver/include/region.h
@@ -1,4 +1,4 @@
-/* $XConsortium: region.h,v 1.4 94/01/07 09:40:34 dpw Exp $ */
+/* $XConsortium: region.h,v 1.5 94/04/17 20:25:59 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/regionstr.h b/xc/programs/Xserver/include/regionstr.h
index d502bd754..0efd965b5 100644
--- a/xc/programs/Xserver/include/regionstr.h
+++ b/xc/programs/Xserver/include/regionstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: regionstr.h,v 1.7 94/01/12 17:59:40 dpw Exp $ */
+/* $XConsortium: regionstr.h,v 1.8 94/04/17 20:26:01 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/resource.h b/xc/programs/Xserver/include/resource.h
index fa796aaa8..faa4f61af 100644
--- a/xc/programs/Xserver/include/resource.h
+++ b/xc/programs/Xserver/include/resource.h
@@ -1,4 +1,4 @@
-/* $XConsortium: resource.h,v 1.20 94/03/18 12:25:50 dpw Exp $ */
+/* $XConsortium: resource.h,v 1.21 94/04/17 20:26:02 dpw Exp $ */
/***********************************************************
Copyright (c) 1987, 1989 X Consortium
diff --git a/xc/programs/Xserver/include/rgb.h b/xc/programs/Xserver/include/rgb.h
index 9d3c486eb..e72e82aef 100644
--- a/xc/programs/Xserver/include/rgb.h
+++ b/xc/programs/Xserver/include/rgb.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: rgb.h,v 1.3 88/09/06 15:48:42 jim Exp $ */
+/* $XConsortium: rgb.h,v 1.4 94/04/17 20:26:04 jim Exp $ */
#ifndef RGB_H
#define RGB_H
diff --git a/xc/programs/Xserver/include/screenint.h b/xc/programs/Xserver/include/screenint.h
index fd2af3c30..237247c63 100644
--- a/xc/programs/Xserver/include/screenint.h
+++ b/xc/programs/Xserver/include/screenint.h
@@ -1,4 +1,4 @@
-/* $XConsortium: screenint.h,v 1.4 93/09/24 12:17:45 rws Exp $ */
+/* $XConsortium: screenint.h,v 1.5 94/04/17 20:26:05 rws Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/scrnintstr.h b/xc/programs/Xserver/include/scrnintstr.h
index 86d5571cf..64e42054f 100644
--- a/xc/programs/Xserver/include/scrnintstr.h
+++ b/xc/programs/Xserver/include/scrnintstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: scrnintstr.h,v 5.23 94/02/23 15:47:41 dpw Exp $ */
+/* $XConsortium: scrnintstr.h,v 5.24 94/04/17 20:26:06 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/selection.h b/xc/programs/Xserver/include/selection.h
index 30eaaa3e1..6346e245e 100644
--- a/xc/programs/Xserver/include/selection.h
+++ b/xc/programs/Xserver/include/selection.h
@@ -1,4 +1,4 @@
-/* $XConsortium: selection.h,v 1.2 88/09/06 15:48:36 jim Exp $ */
+/* $XConsortium: selection.h,v 1.3 94/04/17 20:26:07 jim Exp $ */
#ifndef SELECTION_H
#define SELECTION_H 1
diff --git a/xc/programs/Xserver/include/servermd.h b/xc/programs/Xserver/include/servermd.h
index 6f5a9b682..72c3aecdf 100644
--- a/xc/programs/Xserver/include/servermd.h
+++ b/xc/programs/Xserver/include/servermd.h
@@ -47,7 +47,7 @@ SOFTWARE.
******************************************************************/
#ifndef SERVERMD_H
#define SERVERMD_H 1
-/* $XConsortium: servermd.h,v 1.73 95/01/09 20:56:43 kaleb Exp kaleb $ */
+/* $XConsortium: servermd.h,v 1.74 95/04/07 18:59:05 kaleb Exp $ */
/*
* Machine dependent values:
diff --git a/xc/programs/Xserver/include/site.h b/xc/programs/Xserver/include/site.h
index 6a2d35790..874fda3f4 100644
--- a/xc/programs/Xserver/include/site.h
+++ b/xc/programs/Xserver/include/site.h
@@ -1,4 +1,4 @@
-/* $XConsortium: site.h,v 1.24 94/04/17 20:26:10 rws Exp gildea $ */
+/* $XConsortium: site.h,v 1.25 95/07/10 21:18:07 gildea Exp $ */
/************************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/validate.h b/xc/programs/Xserver/include/validate.h
index 5a8533816..756ad89cb 100644
--- a/xc/programs/Xserver/include/validate.h
+++ b/xc/programs/Xserver/include/validate.h
@@ -1,4 +1,4 @@
-/* $XConsortium: validate.h,v 5.3 93/09/29 17:07:15 dpw Exp $ */
+/* $XConsortium: validate.h,v 5.4 94/04/17 20:26:11 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/include/window.h b/xc/programs/Xserver/include/window.h
index 325399f56..7d991e2c8 100644
--- a/xc/programs/Xserver/include/window.h
+++ b/xc/programs/Xserver/include/window.h
@@ -1,4 +1,4 @@
-/* $XConsortium: window.h,v 1.6 93/09/29 17:12:04 dpw Exp $ */
+/* $XConsortium: window.h,v 1.7 94/04/17 20:26:12 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/windowstr.h b/xc/programs/Xserver/include/windowstr.h
index 352b8709b..e1afb0031 100644
--- a/xc/programs/Xserver/include/windowstr.h
+++ b/xc/programs/Xserver/include/windowstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: windowstr.h,v 5.19 94/04/17 20:26:13 dpw Exp dpw $ */
+/* $XConsortium: windowstr.h,v 5.20 95/06/15 19:30:17 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/include/xthreads.h b/xc/programs/Xserver/include/xthreads.h
deleted file mode 100644
index bdb43bab9..000000000
--- a/xc/programs/Xserver/include/xthreads.h
+++ /dev/null
@@ -1,204 +0,0 @@
-
-/************************************************************************
- *
- * xthreads.h --
- *
- *
- * Copyright 1992, 1993 Data General Corporation;
- * Copyright 1992, 1993 OMRON Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that neither the name OMRON or DATA GENERAL be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission of the party whose name is to be used. Neither
- * OMRON or DATA GENERAL make any representation about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
- * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, 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.
- *
- ************************************************************************/
-
-/* $XConsortium: xthreads.h,v 1.5 94/01/11 20:59:44 rob Exp $ */
-
-#ifndef XTHREADS_H
-#define XTHREADS_H
-
-#ifdef XTHREADS
-#ifndef AIXV3
-#include "pthread.h"
-#else
-#include <dce/pthread.h>
-#endif /* !AIXV3 */
-
-/******************************
- * Default attributes
- ******************************/
-#ifdef AIXV3
-#define X_COT_ATTR_DEFAULT pthread_attr_default
-#define X_CIT_ATTR_DEFAULT pthread_attr_default
-#define X_DIT_ATTR_DEFAULT pthread_attr_default
-#define X_CCT_ATTR_DEFAULT pthread_attr_default
-#define X_MUTEX_ATTR_DEFAULT pthread_mutexattr_default
-#define X_COND_ATTR_DEFAULT pthread_condattr_default
-#else
-#define X_COT_ATTR_DEFAULT NULL
-#define X_CIT_ATTR_DEFAULT NULL
-#define X_DIT_ATTR_DEFAULT NULL
-#define X_CCT_ATTR_DEFAULT NULL
-#define X_MUTEX_ATTR_DEFAULT NULL
-#define X_COND_ATTR_DEFAULT NULL
-#endif
-
-/******************************
- * pthread types
- ******************************/
-
-#define X_THREAD_TYPE pthread_t
-#define X_MUTEX_TYPE pthread_mutex_t
-#define X_COND_TYPE pthread_cond_t
-#define X_KEY_TYPE pthread_key_t
-
-/******************************
- * pthread functions
- ******************************/
-
-#define X_THREAD_CREATE pthread_create
-#define X_THREAD_DETACH pthread_detach
-#define X_THREAD_EXIT pthread_exit
-#define X_THREAD_SELF pthread_self
-#define X_THREAD_YIELD pthread_yield
-#define X_THREAD_CANCEL pthread_cancel
-#define X_THREAD_EQUAL pthread_equal
-
-#ifdef AIXV3
-#define X_KEY_CREATE pthread_keycreate
-#else
-#define X_KEY_CREATE pthread_key_create
-#endif
-#define X_SETSPECIFIC pthread_setspecific
-#define X_GETSPECIFIC pthread_getspecific
-
-#define X_MUTEX_INIT pthread_mutex_init
-#define X_MUTEX_DESTROY pthread_mutex_destroy
-#define X_MUTEX_LOCK pthread_mutex_lock
-#define X_MUTEX_UNLOCK pthread_mutex_unlock
-
-#define X_COND_INIT pthread_cond_init
-#define X_COND_DESTROY pthread_cond_destroy
-#define X_COND_WAIT pthread_cond_wait
-#define X_COND_SIGNAL pthread_cond_signal
-#define X_COND_BROADCAST pthread_cond_broadcast
-
-#define X_SETINTR pthread_setintr
-#define X_CLEANUP_PUSH pthread_cleanup_push
-#define X_CLEANUP_POP pthread_cleanup_pop
-
-/***********************************************************************
- *
- * Associate symbol name with thread, mutex, or condition only when
- * compiling for MTX Monitor.
- *
- ***********************************************************************/
-
-#ifdef USE_MONITOR_MTX
-#define X_SET_SYMNAME(a, b) pthread_set_symname(a, b)
-#else
-#define X_SET_SYMNAME(a, b)
-#endif
-
-/***********************************************************************
- *
- * The following macro returns the clientRec of the calling thread.
- *
- ***********************************************************************/
-
-#define X_GET_CLIENT_REC(client) X_GETSPECIFIC(ClientKey, (void *)&(client))
-
-extern X_KEY_TYPE ClientKey;
-
-#else
-
-/******************************
- * Default attributes
- ******************************/
-#define X_COT_ATTR_DEFAULT
-#define X_CIT_ATTR_DEFAULT
-#define X_DIT_ATTR_DEFAULT
-#define X_CCT_ATTR_DEFAULT
-#define X_MUTEX_ATTR_DEFAULT
-#define X_COND_ATTR_DEFAULT
-
-/******************************
- * pthread types
- ******************************/
-
-#define X_THREAD_TYPE
-#define X_MUTEX_TYPE
-#define X_COND_TYPE
-#define X_KEY_TYPE
-
-/******************************
- * pthread functions
- ******************************/
-
-#define X_THREAD_CREATE
-#define X_THREAD_DETACH
-#define X_THREAD_EXIT
-#define X_THREAD_SELF
-#define X_THREAD_YIELD
-#define X_THREAD_CANCEL
-
-#define X_KEY_CREATE
-#define X_SETSPECIFIC
-#define X_GETSPECIFIC
-
-#define X_MUTEX_INIT
-#define X_MUTEX_DESTROY
-#define X_MUTEX_LOCK
-#define X_MUTEX_UNLOCK
-
-#define X_COND_INIT
-#define X_COND_DESTROY
-#define X_COND_WAIT
-#define X_COND_SIGNAL
-#define X_COND_BROADCAST
-
-#define X_SETINTR
-#define X_CLEANUP_PUSH
-#define X_CLEANUP_POP
-
-/***********************************************************************
- *
- * Associate symbol name with thread, mutex, or condition only when
- * compiling for MTX Monitor.
- *
- ***********************************************************************/
-
-#ifdef USE_MONITOR_MTX
-#define X_SET_SYMNAME(a, b) pthread_set_symname(a, b)
-#else
-#define X_SET_SYMNAME(a, b)
-#endif
-
-/***********************************************************************
- *
- * The following macro returns the clientRec of the calling thread.
- *
- ***********************************************************************/
-
-#define X_GET_CLIENT_REC(client) X_GETSPECIFIC(ClientKey, (void *)&(client))
-
-extern X_KEY_TYPE ClientKey;
-#endif
-
-#endif /* XTHREADS_H */
diff --git a/xc/programs/Xserver/mfb/Imakefile b/xc/programs/Xserver/mfb/Imakefile
index a8f257b61..89c50d603 100644
--- a/xc/programs/Xserver/mfb/Imakefile
+++ b/xc/programs/Xserver/mfb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.38 94/03/11 18:47:47 dpw Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.39 94/11/21 18:28:53 kaleb Exp $
#include <Server.tmpl>
SRCS1 = mfbgc.c mfbwindow.c mfbfont.c \
diff --git a/xc/programs/Xserver/mfb/fastblt.h b/xc/programs/Xserver/mfb/fastblt.h
index 1b54cab44..0ca295d62 100644
--- a/xc/programs/Xserver/mfb/fastblt.h
+++ b/xc/programs/Xserver/mfb/fastblt.h
@@ -1,4 +1,4 @@
-/* $XConsortium: fastblt.h,v 1.6 94/04/12 17:25:50 dpw Exp $ */
+/* $XConsortium: fastblt.h,v 1.7 94/04/17 20:28:07 dpw Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/mfb/maskbits.c b/xc/programs/Xserver/mfb/maskbits.c
index c08cc58ec..9d0a2b9e5 100644
--- a/xc/programs/Xserver/mfb/maskbits.c
+++ b/xc/programs/Xserver/mfb/maskbits.c
@@ -1,4 +1,4 @@
-/* $XConsortium: maskbits.c,v 1.15 94/04/17 20:28:09 dpw Exp kaleb $ */
+/* $XConsortium: maskbits.c,v 1.16 95/04/07 18:59:14 kaleb Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/*
diff --git a/xc/programs/Xserver/mfb/maskbits.h b/xc/programs/Xserver/mfb/maskbits.h
index f05a417e6..8bfcb0d90 100644
--- a/xc/programs/Xserver/mfb/maskbits.h
+++ b/xc/programs/Xserver/mfb/maskbits.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: maskbits.h,v 1.32 94/03/16 15:11:38 dpw Exp $ */
+/* $XConsortium: maskbits.h,v 1.33 94/04/17 20:28:13 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
#include "servermd.h"
diff --git a/xc/programs/Xserver/mfb/mergerop.h b/xc/programs/Xserver/mfb/mergerop.h
index 35b507022..468b74ab2 100644
--- a/xc/programs/Xserver/mfb/mergerop.h
+++ b/xc/programs/Xserver/mfb/mergerop.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: mergerop.h,v 1.10 94/04/17 20:28:14 dpw Exp gildea $
+ * $XConsortium: mergerop.h,v 1.11 95/06/08 23:20:39 gildea Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/Xserver/mfb/mfb.h b/xc/programs/Xserver/mfb/mfb.h
index cec101e9d..b6cbd6332 100644
--- a/xc/programs/Xserver/mfb/mfb.h
+++ b/xc/programs/Xserver/mfb/mfb.h
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfb.h,v 5.30 94/03/31 14:09:53 dpw Exp $ */
+/* $XConsortium: mfb.h,v 5.31 94/04/17 20:28:15 dpw Exp $ */
/* Monochrome Frame Buffer definitions
written by drewry, september 1986
*/
diff --git a/xc/programs/Xserver/mfb/mfbbitblt.c b/xc/programs/Xserver/mfb/mfbbitblt.c
index 28ad2e075..91781a7bf 100644
--- a/xc/programs/Xserver/mfb/mfbbitblt.c
+++ b/xc/programs/Xserver/mfb/mfbbitblt.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbbitblt.c,v 5.24 94/02/16 11:52:55 dpw Exp $ */
+/* $XConsortium: mfbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */
#include "X.h"
#include "Xprotostr.h"
diff --git a/xc/programs/Xserver/mfb/mfbblt.c b/xc/programs/Xserver/mfb/mfbblt.c
index 186415944..7283f7050 100644
--- a/xc/programs/Xserver/mfb/mfbblt.c
+++ b/xc/programs/Xserver/mfb/mfbblt.c
@@ -30,7 +30,7 @@ in this Software without prior written authorization from the X Consortium.
Author: Keith Packard
*/
-/* $XConsortium: mfbblt.c,v 1.10 94/03/31 14:10:16 dpw Exp $ */
+/* $XConsortium: mfbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/mfb/mfbbres.c b/xc/programs/Xserver/mfb/mfbbres.c
index 9c627cafe..22d8566e1 100644
--- a/xc/programs/Xserver/mfb/mfbbres.c
+++ b/xc/programs/Xserver/mfb/mfbbres.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbbres.c,v 1.21 94/03/31 14:10:19 dpw Exp $ */
+/* $XConsortium: mfbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */
#include "X.h"
#include "misc.h"
#include "mfb.h"
diff --git a/xc/programs/Xserver/mfb/mfbbresd.c b/xc/programs/Xserver/mfb/mfbbresd.c
index e1008400c..0f375931c 100644
--- a/xc/programs/Xserver/mfb/mfbbresd.c
+++ b/xc/programs/Xserver/mfb/mfbbresd.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbbresd.c,v 1.9 94/03/31 14:10:22 dpw Exp $ */
+/* $XConsortium: mfbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */
#include "X.h"
#include "misc.h"
#include "mfb.h"
diff --git a/xc/programs/Xserver/mfb/mfbbstore.c b/xc/programs/Xserver/mfb/mfbbstore.c
index bb4c36079..536525de5 100644
--- a/xc/programs/Xserver/mfb/mfbbstore.c
+++ b/xc/programs/Xserver/mfb/mfbbstore.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mfbbstore.c,v 5.6 94/01/12 18:04:41 dpw Exp $ */
+/* $XConsortium: mfbbstore.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/xc/programs/Xserver/mfb/mfbclip.c b/xc/programs/Xserver/mfb/mfbclip.c
index 388cee684..47a028072 100644
--- a/xc/programs/Xserver/mfb/mfbclip.c
+++ b/xc/programs/Xserver/mfb/mfbclip.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbclip.c,v 5.5 94/01/12 18:04:43 dpw Exp $ */
+/* $XConsortium: mfbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */
#include "X.h"
#include "miscstruct.h"
#include "pixmapstr.h"
diff --git a/xc/programs/Xserver/mfb/mfbcmap.c b/xc/programs/Xserver/mfb/mfbcmap.c
index 50de89189..dd08fa08e 100644
--- a/xc/programs/Xserver/mfb/mfbcmap.c
+++ b/xc/programs/Xserver/mfb/mfbcmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbcmap.c,v 5.5 94/01/21 22:01:39 dpw Exp $ */
+/* $XConsortium: mfbcmap.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */
#include "X.h"
#include "scrnintstr.h"
#include "colormapst.h"
diff --git a/xc/programs/Xserver/mfb/mfbfillarc.c b/xc/programs/Xserver/mfb/mfbfillarc.c
index 6e3106f69..306c1ad2f 100644
--- a/xc/programs/Xserver/mfb/mfbfillarc.c
+++ b/xc/programs/Xserver/mfb/mfbfillarc.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: mfbfillarc.c,v 5.13 94/03/31 14:10:24 dpw Exp $ */
+/* $XConsortium: mfbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */
#include "X.h"
#include "Xprotostr.h"
diff --git a/xc/programs/Xserver/mfb/mfbfillrct.c b/xc/programs/Xserver/mfb/mfbfillrct.c
index 469065f09..ea55f51d0 100644
--- a/xc/programs/Xserver/mfb/mfbfillrct.c
+++ b/xc/programs/Xserver/mfb/mfbfillrct.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbfillrct.c,v 5.9 94/01/07 09:43:22 dpw Exp $ */
+/* $XConsortium: mfbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */
#include "X.h"
#include "Xprotostr.h"
#include "pixmapstr.h"
diff --git a/xc/programs/Xserver/mfb/mfbfillsp.c b/xc/programs/Xserver/mfb/mfbfillsp.c
index aa53a247a..4b6b78bdb 100644
--- a/xc/programs/Xserver/mfb/mfbfillsp.c
+++ b/xc/programs/Xserver/mfb/mfbfillsp.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbfillsp.c,v 5.12 94/03/31 14:08:31 dpw Exp $ */
+/* $XConsortium: mfbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/mfb/mfbfont.c b/xc/programs/Xserver/mfb/mfbfont.c
index 977f56b9b..ffa1db508 100644
--- a/xc/programs/Xserver/mfb/mfbfont.c
+++ b/xc/programs/Xserver/mfb/mfbfont.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
*/
-/* $XConsortium: mfbfont.c,v 1.17 91/01/27 13:02:13 keith Exp $ */
+/* $XConsortium: mfbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */
#include "X.h"
#include "Xmd.h"
#include "Xproto.h"
diff --git a/xc/programs/Xserver/mfb/mfbgc.c b/xc/programs/Xserver/mfb/mfbgc.c
index 2589a514c..72fbb110d 100644
--- a/xc/programs/Xserver/mfb/mfbgc.c
+++ b/xc/programs/Xserver/mfb/mfbgc.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbgc.c,v 5.34 94/03/22 16:58:59 dpw Exp $ */
+/* $XConsortium: mfbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
#include "Xproto.h"
diff --git a/xc/programs/Xserver/mfb/mfbgetsp.c b/xc/programs/Xserver/mfb/mfbgetsp.c
index 2e4cea6f1..0c6639fbc 100644
--- a/xc/programs/Xserver/mfb/mfbgetsp.c
+++ b/xc/programs/Xserver/mfb/mfbgetsp.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbgetsp.c,v 5.9 94/01/12 18:04:57 dpw Exp $ */
+/* $XConsortium: mfbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/mfb/mfbhrzvert.c b/xc/programs/Xserver/mfb/mfbhrzvert.c
index 2f63b11c5..8da14d3f6 100644
--- a/xc/programs/Xserver/mfb/mfbhrzvert.c
+++ b/xc/programs/Xserver/mfb/mfbhrzvert.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbhrzvert.c,v 1.14 94/01/12 18:05:00 dpw Exp $ */
+/* $XConsortium: mfbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */
#include "X.h"
#include "gc.h"
diff --git a/xc/programs/Xserver/mfb/mfbimage.c b/xc/programs/Xserver/mfb/mfbimage.c
index 5d67f29e8..77f66f513 100644
--- a/xc/programs/Xserver/mfb/mfbimage.c
+++ b/xc/programs/Xserver/mfb/mfbimage.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbimage.c,v 5.9 94/01/07 09:43:25 dpw Exp $ */
+/* $XConsortium: mfbimage.c,v 5.10 94/04/17 20:28:25 dpw Exp $ */
#include "X.h"
diff --git a/xc/programs/Xserver/mfb/mfbimggblt.c b/xc/programs/Xserver/mfb/mfbimggblt.c
index 90ae12d7e..03c08211e 100644
--- a/xc/programs/Xserver/mfb/mfbimggblt.c
+++ b/xc/programs/Xserver/mfb/mfbimggblt.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbimggblt.c,v 5.16 94/03/31 14:10:26 dpw Exp $ */
+/* $XConsortium: mfbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
#include "Xproto.h"
diff --git a/xc/programs/Xserver/mfb/mfbline.c b/xc/programs/Xserver/mfb/mfbline.c
index bb8954f6b..91a61310a 100644
--- a/xc/programs/Xserver/mfb/mfbline.c
+++ b/xc/programs/Xserver/mfb/mfbline.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */
+/* $XConsortium: mfbline.c,v 5.19 94/07/28 14:28:21 dpw Exp $ */
#include "X.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/mfb/mfbmisc.c b/xc/programs/Xserver/mfb/mfbmisc.c
index 5941b03d6..ced94b376 100644
--- a/xc/programs/Xserver/mfb/mfbmisc.c
+++ b/xc/programs/Xserver/mfb/mfbmisc.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbmisc.c,v 5.3 93/09/13 09:31:13 dpw Exp $ */
+/* $XConsortium: mfbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */
#include "X.h"
#include "misc.h"
#include "cursor.h"
diff --git a/xc/programs/Xserver/mfb/mfbpixmap.c b/xc/programs/Xserver/mfb/mfbpixmap.c
index 244a0ab64..8feccd180 100644
--- a/xc/programs/Xserver/mfb/mfbpixmap.c
+++ b/xc/programs/Xserver/mfb/mfbpixmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbpixmap.c,v 5.12 94/03/11 17:12:41 dpw Exp $ */
+/* $XConsortium: mfbpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */
/* pixmap management
written by drewry, september 1986
diff --git a/xc/programs/Xserver/mfb/mfbply1rct.c b/xc/programs/Xserver/mfb/mfbply1rct.c
index 7a5ed41d2..36dc74889 100644
--- a/xc/programs/Xserver/mfb/mfbply1rct.c
+++ b/xc/programs/Xserver/mfb/mfbply1rct.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: mfbply1rct.c,v 1.8 94/01/21 22:02:18 dpw Exp $
+ * $XConsortium: mfbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/mfb/mfbplygblt.c b/xc/programs/Xserver/mfb/mfbplygblt.c
index ac36d6dcb..4480f3fd5 100644
--- a/xc/programs/Xserver/mfb/mfbplygblt.c
+++ b/xc/programs/Xserver/mfb/mfbplygblt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbplygblt.c,v 5.13 94/03/31 14:10:30 dpw Exp $ */
+/* $XConsortium: mfbplygblt.c,v 5.14 94/04/17 20:28:29 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/mfb/mfbpntarea.c b/xc/programs/Xserver/mfb/mfbpntarea.c
index a53aa8d35..b8122d1c5 100644
--- a/xc/programs/Xserver/mfb/mfbpntarea.c
+++ b/xc/programs/Xserver/mfb/mfbpntarea.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbpntarea.c,v 5.6 94/03/31 14:10:33 dpw Exp $ */
+/* $XConsortium: mfbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */
#include "X.h"
#include "windowstr.h"
diff --git a/xc/programs/Xserver/mfb/mfbpntwin.c b/xc/programs/Xserver/mfb/mfbpntwin.c
index a2f47465f..bccadc086 100644
--- a/xc/programs/Xserver/mfb/mfbpntwin.c
+++ b/xc/programs/Xserver/mfb/mfbpntwin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mfbpntwin.c,v 5.11 94/01/12 18:05:21 dpw Exp $ */
+/* $XConsortium: mfbpntwin.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/xc/programs/Xserver/mfb/mfbpolypnt.c b/xc/programs/Xserver/mfb/mfbpolypnt.c
index d4cb39dea..fe9fca3af 100644
--- a/xc/programs/Xserver/mfb/mfbpolypnt.c
+++ b/xc/programs/Xserver/mfb/mfbpolypnt.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbpolypnt.c,v 5.5 94/01/12 18:05:23 dpw Exp $ */
+/* $XConsortium: mfbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */
#include "X.h"
#include "Xprotostr.h"
diff --git a/xc/programs/Xserver/mfb/mfbpushpxl.c b/xc/programs/Xserver/mfb/mfbpushpxl.c
index 914bc9c47..690c56c3f 100644
--- a/xc/programs/Xserver/mfb/mfbpushpxl.c
+++ b/xc/programs/Xserver/mfb/mfbpushpxl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbpushpxl.c,v 5.5 94/01/12 18:05:25 dpw Exp $ */
+/* $XConsortium: mfbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */
#include "X.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/mfb/mfbscrclse.c b/xc/programs/Xserver/mfb/mfbscrclse.c
index fedd1af38..3bccf509d 100644
--- a/xc/programs/Xserver/mfb/mfbscrclse.c
+++ b/xc/programs/Xserver/mfb/mfbscrclse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mfbscrclse.c,v 1.7 89/07/18 20:05:04 rws Exp $ */
+/* $XConsortium: mfbscrclse.c,v 1.8 94/04/17 20:28:33 rws Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mfb/mfbscrinit.c b/xc/programs/Xserver/mfb/mfbscrinit.c
index 31d2811c4..5dce5af2c 100644
--- a/xc/programs/Xserver/mfb/mfbscrinit.c
+++ b/xc/programs/Xserver/mfb/mfbscrinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbscrinit.c,v 5.16 93/12/13 17:26:27 dpw Exp $ */
+/* $XConsortium: mfbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */
#include "X.h"
#include "Xproto.h" /* for xColorItem */
diff --git a/xc/programs/Xserver/mfb/mfbsetsp.c b/xc/programs/Xserver/mfb/mfbsetsp.c
index 09d0f6b96..993ac72f9 100644
--- a/xc/programs/Xserver/mfb/mfbsetsp.c
+++ b/xc/programs/Xserver/mfb/mfbsetsp.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbsetsp.c,v 5.7 94/01/12 18:05:29 dpw Exp $ */
+/* $XConsortium: mfbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/mfb/mfbtegblt.c b/xc/programs/Xserver/mfb/mfbtegblt.c
index ee7250e08..8e91c0830 100644
--- a/xc/programs/Xserver/mfb/mfbtegblt.c
+++ b/xc/programs/Xserver/mfb/mfbtegblt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mfbtegblt.c,v 5.13 94/03/31 14:06:52 dpw Exp $ */
+/* $XConsortium: mfbtegblt.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/xc/programs/Xserver/mfb/mfbtile.c b/xc/programs/Xserver/mfb/mfbtile.c
index f96e9dbbe..52cb7a2a2 100644
--- a/xc/programs/Xserver/mfb/mfbtile.c
+++ b/xc/programs/Xserver/mfb/mfbtile.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mfbtile.c,v 5.7 94/03/31 14:10:35 dpw Exp $ */
+/* $XConsortium: mfbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */
#include "X.h"
#include "windowstr.h"
diff --git a/xc/programs/Xserver/mfb/mfbwindow.c b/xc/programs/Xserver/mfb/mfbwindow.c
index 066cfb4f4..3843d362f 100644
--- a/xc/programs/Xserver/mfb/mfbwindow.c
+++ b/xc/programs/Xserver/mfb/mfbwindow.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mfbwindow.c,v 5.13 94/03/22 16:58:05 dpw Exp $ */
+/* $XConsortium: mfbwindow.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/xc/programs/Xserver/mfb/mfbzerarc.c b/xc/programs/Xserver/mfb/mfbzerarc.c
index daac8c2e3..e14a4bdf8 100644
--- a/xc/programs/Xserver/mfb/mfbzerarc.c
+++ b/xc/programs/Xserver/mfb/mfbzerarc.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: mfbzerarc.c,v 5.18 94/03/31 14:07:57 dpw Exp $ */
+/* $XConsortium: mfbzerarc.c,v 5.19 94/04/17 20:28:37 dpw Exp $ */
/* Derived from:
* "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
diff --git a/xc/programs/Xserver/mi/Imakefile b/xc/programs/Xserver/mi/Imakefile
index ae64cc0e7..6897292b2 100644
--- a/xc/programs/Xserver/mi/Imakefile
+++ b/xc/programs/Xserver/mi/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 5.23 94/11/21 18:28:11 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 5.24 95/01/06 21:58:10 kaleb Exp $
#include <Server.tmpl>
SRCS = mivaltree.c mipolyseg.c mipolyrect.c \
diff --git a/xc/programs/Xserver/mi/cbrt.c b/xc/programs/Xserver/mi/cbrt.c
index 1d2f041bf..8545e46c6 100644
--- a/xc/programs/Xserver/mi/cbrt.c
+++ b/xc/programs/Xserver/mi/cbrt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cbrt.c,v 1.1 94/04/12 17:25:08 dpw Exp $ */
+/* $XConsortium: cbrt.c,v 1.2 94/04/17 20:27:10 dpw Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/mi/mi.h b/xc/programs/Xserver/mi/mi.h
index 0fd890901..e67c37847 100644
--- a/xc/programs/Xserver/mi/mi.h
+++ b/xc/programs/Xserver/mi/mi.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mi.h,v 1.16 94/03/17 18:14:10 dpw Exp $ */
+/* $XConsortium: mi.h,v 1.17 94/04/17 20:27:10 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mi/miarc.c b/xc/programs/Xserver/mi/miarc.c
index b7268068b..fb57f4133 100644
--- a/xc/programs/Xserver/mi/miarc.c
+++ b/xc/programs/Xserver/mi/miarc.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: miarc.c,v 5.51 94/07/25 13:47:32 kaleb Exp $ */
+/* $XConsortium: miarc.c,v 5.52 95/06/15 17:02:39 dpw Exp $ */
/* Author: Keith Packard and Bob Scheifler */
/* Warning: this code is toxic, do not dally very long here. */
diff --git a/xc/programs/Xserver/mi/mibitblt.c b/xc/programs/Xserver/mi/mibitblt.c
index 5d2e38c26..9324e6343 100644
--- a/xc/programs/Xserver/mi/mibitblt.c
+++ b/xc/programs/Xserver/mi/mibitblt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mibitblt.c,v 5.23 94/03/17 18:14:34 dpw Exp $ */
+/* $XConsortium: mibitblt.c,v 5.24 94/04/17 20:27:19 dpw Exp $ */
/* Author: Todd Newman (aided and abetted by Mr. Drewry) */
#include "X.h"
diff --git a/xc/programs/Xserver/mi/mibstore.c b/xc/programs/Xserver/mi/mibstore.c
index 1d15eefca..935f758f2 100644
--- a/xc/programs/Xserver/mi/mibstore.c
+++ b/xc/programs/Xserver/mi/mibstore.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mibstore.c,v 5.62 94/04/17 20:27:23 dpw Exp $ */
+/* $XConsortium: mibstore.c,v 5.63 94/10/21 20:25:08 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mi/mibstore.h b/xc/programs/Xserver/mi/mibstore.h
index cb3ef3187..00ce5128b 100644
--- a/xc/programs/Xserver/mi/mibstore.h
+++ b/xc/programs/Xserver/mi/mibstore.h
@@ -12,7 +12,7 @@
* software for any purpose. It is provided "as is" without
* express or implied warranty.
*
- * "$XConsortium: mibstore.h,v 5.1 91/05/10 17:39:33 keith Exp $ SPRITE (Berkeley)"
+ * "$XConsortium: mibstore.h,v 5.2 93/10/12 11:41:12 dpw Exp $ SPRITE (Berkeley)"
*/
#ifndef _MIBSTORE_H
diff --git a/xc/programs/Xserver/mi/mibstorest.h b/xc/programs/Xserver/mi/mibstorest.h
index 8dc3efdf0..bfa457a63 100644
--- a/xc/programs/Xserver/mi/mibstorest.h
+++ b/xc/programs/Xserver/mi/mibstorest.h
@@ -4,7 +4,7 @@
* internal structure definitions for mi backing store
*/
-/* $XConsortium: mibstorest.h,v 5.9 93/10/12 11:41:18 dpw Exp $ */
+/* $XConsortium: mibstorest.h,v 5.10 94/04/17 20:27:25 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/miclipn.c b/xc/programs/Xserver/mi/miclipn.c
index 490104bc4..9970de5c8 100644
--- a/xc/programs/Xserver/mi/miclipn.c
+++ b/xc/programs/Xserver/mi/miclipn.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miclipn.c,v 5.0 90/09/24 09:41:16 rws Exp $ */
+/* $XConsortium: miclipn.c,v 5.1 94/04/17 20:27:26 rws Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/mi/micursor.c b/xc/programs/Xserver/mi/micursor.c
index 0255bb424..199917083 100644
--- a/xc/programs/Xserver/mi/micursor.c
+++ b/xc/programs/Xserver/mi/micursor.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: micursor.c,v 1.9 89/07/18 20:33:02 rws Exp $ */
+/* $XConsortium: micursor.c,v 1.10 94/04/17 20:27:26 rws Exp $ */
#include "scrnintstr.h"
#include "cursor.h"
#include "misc.h"
diff --git a/xc/programs/Xserver/mi/midash.c b/xc/programs/Xserver/mi/midash.c
index 58ecce02c..d566ff083 100644
--- a/xc/programs/Xserver/mi/midash.c
+++ b/xc/programs/Xserver/mi/midash.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: midash.c,v 5.4 93/09/21 08:55:00 dpw Exp $ */
+/* $XConsortium: midash.c,v 5.5 94/04/17 20:27:27 dpw Exp $ */
#include "miscstruct.h"
#include "mistruct.h"
#include "mifpoly.h"
diff --git a/xc/programs/Xserver/mi/midispcur.c b/xc/programs/Xserver/mi/midispcur.c
index 97b39398d..5ea478ea0 100644
--- a/xc/programs/Xserver/mi/midispcur.c
+++ b/xc/programs/Xserver/mi/midispcur.c
@@ -4,7 +4,7 @@
* machine independent cursor display routines
*/
-/* $XConsortium: midispcur.c,v 5.13 93/10/12 11:41:20 dpw Exp $ */
+/* $XConsortium: midispcur.c,v 5.14 94/04/17 20:27:28 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mieq.c b/xc/programs/Xserver/mi/mieq.c
index 8c335ee82..0f338de3e 100644
--- a/xc/programs/Xserver/mi/mieq.c
+++ b/xc/programs/Xserver/mi/mieq.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: mieq.c,v 1.7 94/04/17 20:27:31 dpw Exp kaleb $
+ * $XConsortium: mieq.c,v 1.8 94/11/02 15:59:29 kaleb Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/mi/miexpose.c b/xc/programs/Xserver/mi/miexpose.c
index d2622a151..c290987eb 100644
--- a/xc/programs/Xserver/mi/miexpose.c
+++ b/xc/programs/Xserver/mi/miexpose.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: miexpose.c,v 5.19 94/01/21 22:03:29 dpw Exp $ */
+/* $XConsortium: miexpose.c,v 5.20 94/04/17 20:27:32 dpw Exp $ */
#include "X.h"
#define NEED_EVENTS
diff --git a/xc/programs/Xserver/mi/mifillarc.c b/xc/programs/Xserver/mi/mifillarc.c
index f325ba5ff..d5a8962f5 100644
--- a/xc/programs/Xserver/mi/mifillarc.c
+++ b/xc/programs/Xserver/mi/mifillarc.c
@@ -27,7 +27,7 @@ Author: Bob Scheifler, MIT X Consortium
********************************************************/
-/* $XConsortium: mifillarc.c,v 5.17 94/04/17 20:27:33 keith Exp kaleb $ */
+/* $XConsortium: mifillarc.c,v 5.18 95/01/10 20:59:49 kaleb Exp $ */
#include <math.h>
#include "X.h"
diff --git a/xc/programs/Xserver/mi/mifillarc.h b/xc/programs/Xserver/mi/mifillarc.h
index e4c324e91..fd49c2f50 100644
--- a/xc/programs/Xserver/mi/mifillarc.h
+++ b/xc/programs/Xserver/mi/mifillarc.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: mifillarc.h,v 5.8 95/01/10 20:59:49 kaleb Exp dpw $ */
+/* $XConsortium: mifillarc.h,v 5.9 95/01/11 16:19:24 dpw Exp $ */
#define FULLCIRCLE (360 * 64)
diff --git a/xc/programs/Xserver/mi/mifillrct.c b/xc/programs/Xserver/mi/mifillrct.c
index acc448962..761d12d5d 100644
--- a/xc/programs/Xserver/mi/mifillrct.c
+++ b/xc/programs/Xserver/mi/mifillrct.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mifillrct.c,v 5.0 89/06/09 15:08:22 keith Exp $ */
+/* $XConsortium: mifillrct.c,v 5.1 94/04/17 20:27:34 keith Exp $ */
#include "X.h"
#include "Xprotostr.h"
diff --git a/xc/programs/Xserver/mi/mifpoly.h b/xc/programs/Xserver/mi/mifpoly.h
index bb3f7fbe7..44be2ada1 100644
--- a/xc/programs/Xserver/mi/mifpoly.h
+++ b/xc/programs/Xserver/mi/mifpoly.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mifpoly.h,v 1.8 94/03/21 15:36:51 dpw Exp $ */
+/* $XConsortium: mifpoly.h,v 1.9 94/04/17 20:27:35 dpw Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mi/mifpolycon.c b/xc/programs/Xserver/mi/mifpolycon.c
index 20189fc88..5ccd3acf6 100644
--- a/xc/programs/Xserver/mi/mifpolycon.c
+++ b/xc/programs/Xserver/mi/mifpolycon.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mifpolycon.c,v 5.3 89/07/28 12:13:45 rws Exp $ */
+/* $XConsortium: mifpolycon.c,v 5.4 94/04/17 20:27:36 rws Exp $ */
#include <math.h>
#include "X.h"
#include "gcstruct.h"
diff --git a/xc/programs/Xserver/mi/migc.c b/xc/programs/Xserver/mi/migc.c
index c3ebbb3d6..b96639bd8 100644
--- a/xc/programs/Xserver/mi/migc.c
+++ b/xc/programs/Xserver/mi/migc.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: migc.c,v 1.4 94/04/17 20:27:36 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/mi/migc.h b/xc/programs/Xserver/mi/migc.h
index 9c38612c1..d6cfe951b 100644
--- a/xc/programs/Xserver/mi/migc.h
+++ b/xc/programs/Xserver/mi/migc.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: migc.h,v 1.3 94/04/17 20:27:37 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/mi/miglblt.c b/xc/programs/Xserver/mi/miglblt.c
index 1e15a603a..63a367931 100644
--- a/xc/programs/Xserver/mi/miglblt.c
+++ b/xc/programs/Xserver/mi/miglblt.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: miglblt.c,v 5.8 94/02/23 15:50:08 dpw Exp $ */
+/* $XConsortium: miglblt.c,v 5.9 94/04/17 20:27:37 dpw Exp $ */
#include "X.h"
#include "Xmd.h"
diff --git a/xc/programs/Xserver/mi/miinitext.c b/xc/programs/Xserver/mi/miinitext.c
index 12162e5b7..9922c9292 100644
--- a/xc/programs/Xserver/mi/miinitext.c
+++ b/xc/programs/Xserver/mi/miinitext.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: miinitext.c,v 1.32 94/04/17 20:27:38 rws Exp $ */
+/* $XConsortium: miinitext.c,v 1.33 95/06/10 01:27:14 dpw Exp $ */
#include "misc.h"
diff --git a/xc/programs/Xserver/mi/miline.h b/xc/programs/Xserver/mi/miline.h
index 09819905f..677be803d 100644
--- a/xc/programs/Xserver/mi/miline.h
+++ b/xc/programs/Xserver/mi/miline.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miline.h,v 1.4 1994/07/28 14:22:39 dpw Exp dpw $ */
+/* $XConsortium: miline.h,v 1.5 94/07/29 11:54:51 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mipointer.c b/xc/programs/Xserver/mi/mipointer.c
index 994fee49d..afcb194fa 100644
--- a/xc/programs/Xserver/mi/mipointer.c
+++ b/xc/programs/Xserver/mi/mipointer.c
@@ -2,7 +2,7 @@
* mipointer.c
*/
-/* $XConsortium: mipointer.c,v 5.23 94/02/23 15:50:10 dpw Exp $ */
+/* $XConsortium: mipointer.c,v 5.24 94/04/17 20:27:39 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mipointer.h b/xc/programs/Xserver/mi/mipointer.h
index e89f76799..310068c93 100644
--- a/xc/programs/Xserver/mi/mipointer.h
+++ b/xc/programs/Xserver/mi/mipointer.h
@@ -3,7 +3,7 @@
*
*/
-/* $XConsortium: mipointer.h,v 5.6 93/12/13 17:31:22 dpw Exp $ */
+/* $XConsortium: mipointer.h,v 5.7 94/04/17 20:27:40 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mipointrst.h b/xc/programs/Xserver/mi/mipointrst.h
index b1cf4e141..0b45e1f7c 100644
--- a/xc/programs/Xserver/mi/mipointrst.h
+++ b/xc/programs/Xserver/mi/mipointrst.h
@@ -3,7 +3,7 @@
*
*/
-/* $XConsortium: mipointrst.h,v 5.6 93/10/12 11:41:59 dpw Exp $ */
+/* $XConsortium: mipointrst.h,v 5.7 94/04/17 20:27:41 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mipoly.c b/xc/programs/Xserver/mi/mipoly.c
index 18bdfc5b0..f7ae592dc 100644
--- a/xc/programs/Xserver/mi/mipoly.c
+++ b/xc/programs/Xserver/mi/mipoly.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipoly.c,v 5.0 89/06/09 15:08:32 keith Exp $ */
+/* $XConsortium: mipoly.c,v 5.1 94/04/17 20:27:41 keith Exp $ */
/*
* mipoly.c
*
diff --git a/xc/programs/Xserver/mi/mipoly.h b/xc/programs/Xserver/mi/mipoly.h
index 0ae1de430..7c8452c3b 100644
--- a/xc/programs/Xserver/mi/mipoly.h
+++ b/xc/programs/Xserver/mi/mipoly.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mipoly.h,v 1.4 94/04/12 17:24:54 dpw Exp $ */
+/* $XConsortium: mipoly.h,v 1.5 94/04/17 20:27:42 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mi/mipolycon.c b/xc/programs/Xserver/mi/mipolycon.c
index 191a8cddb..8001f152d 100644
--- a/xc/programs/Xserver/mi/mipolycon.c
+++ b/xc/programs/Xserver/mi/mipolycon.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipolycon.c,v 5.0 89/06/09 15:08:33 keith Exp $ */
+/* $XConsortium: mipolycon.c,v 5.1 94/04/17 20:27:43 keith Exp $ */
#include "gcstruct.h"
#include "pixmap.h"
#include "miscanfill.h"
diff --git a/xc/programs/Xserver/mi/mipolygen.c b/xc/programs/Xserver/mi/mipolygen.c
index 199dcd244..8a4d3593e 100644
--- a/xc/programs/Xserver/mi/mipolygen.c
+++ b/xc/programs/Xserver/mi/mipolygen.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipolygen.c,v 5.1 93/10/12 11:42:02 dpw Exp $ */
+/* $XConsortium: mipolygen.c,v 5.2 94/04/17 20:27:43 dpw Exp $ */
#include "X.h"
#include "gcstruct.h"
#include "miscanfill.h"
diff --git a/xc/programs/Xserver/mi/mipolypnt.c b/xc/programs/Xserver/mi/mipolypnt.c
index 11e0a1e56..7bb10b1b0 100644
--- a/xc/programs/Xserver/mi/mipolypnt.c
+++ b/xc/programs/Xserver/mi/mipolypnt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipolypnt.c,v 5.1 94/01/21 22:03:10 dpw Exp $ */
+/* $XConsortium: mipolypnt.c,v 5.2 94/04/17 20:27:44 dpw Exp $ */
#include "X.h"
#include "Xprotostr.h"
#include "pixmapstr.h"
diff --git a/xc/programs/Xserver/mi/mipolyrect.c b/xc/programs/Xserver/mi/mipolyrect.c
index e368941f0..acaa95ac3 100644
--- a/xc/programs/Xserver/mi/mipolyrect.c
+++ b/xc/programs/Xserver/mi/mipolyrect.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipolyrect.c,v 5.7 91/05/29 14:56:38 keith Exp $ */
+/* $XConsortium: mipolyrect.c,v 5.8 94/04/17 20:27:44 keith Exp $ */
#include "X.h"
#include "Xprotostr.h"
#include "miscstruct.h"
diff --git a/xc/programs/Xserver/mi/mipolyseg.c b/xc/programs/Xserver/mi/mipolyseg.c
index 10680bcf8..5b53d8c30 100644
--- a/xc/programs/Xserver/mi/mipolyseg.c
+++ b/xc/programs/Xserver/mi/mipolyseg.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipolyseg.c,v 5.0 89/06/09 15:08:39 keith Exp $ */
+/* $XConsortium: mipolyseg.c,v 5.1 94/04/17 20:27:45 keith Exp $ */
#include "X.h"
#include "Xprotostr.h"
#include "miscstruct.h"
diff --git a/xc/programs/Xserver/mi/mipolytext.c b/xc/programs/Xserver/mi/mipolytext.c
index ece5ded65..95cd6bdef 100644
--- a/xc/programs/Xserver/mi/mipolytext.c
+++ b/xc/programs/Xserver/mi/mipolytext.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
************************************************************************/
-/* $XConsortium: mipolytext.c,v 5.3 92/05/15 13:58:20 keith Exp $ */
+/* $XConsortium: mipolytext.c,v 5.4 94/04/17 20:27:45 keith Exp $ */
/*
* mipolytext.c - text routines
*
diff --git a/xc/programs/Xserver/mi/mipolyutil.c b/xc/programs/Xserver/mi/mipolyutil.c
index d7cb1369c..74e654d10 100644
--- a/xc/programs/Xserver/mi/mipolyutil.c
+++ b/xc/programs/Xserver/mi/mipolyutil.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipolyutil.c,v 1.15 93/10/12 11:42:04 dpw Exp $ */
+/* $XConsortium: mipolyutil.c,v 1.16 94/04/17 20:27:46 dpw Exp $ */
#include "miscstruct.h"
#include "gc.h"
#include "miscanfill.h"
diff --git a/xc/programs/Xserver/mi/mipushpxl.c b/xc/programs/Xserver/mi/mipushpxl.c
index 231471752..3e82e0ed1 100644
--- a/xc/programs/Xserver/mi/mipushpxl.c
+++ b/xc/programs/Xserver/mi/mipushpxl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mipushpxl.c,v 5.4 93/09/20 20:24:25 dpw Exp $ */
+/* $XConsortium: mipushpxl.c,v 5.5 94/04/17 20:27:47 dpw Exp $ */
#include "X.h"
#include "gcstruct.h"
#include "scrnintstr.h"
diff --git a/xc/programs/Xserver/mi/miregion.c b/xc/programs/Xserver/mi/miregion.c
index be7e8f9d1..582d34876 100644
--- a/xc/programs/Xserver/mi/miregion.c
+++ b/xc/programs/Xserver/mi/miregion.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: miregion.c,v 1.59 94/01/12 18:05:57 dpw Exp $ */
+/* $XConsortium: miregion.c,v 1.60 94/04/17 20:27:49 dpw Exp $ */
#include <stdio.h>
#include "miscstruct.h"
diff --git a/xc/programs/Xserver/mi/miscanfill.h b/xc/programs/Xserver/mi/miscanfill.h
index 6892505ee..bb6a5cad8 100644
--- a/xc/programs/Xserver/mi/miscanfill.h
+++ b/xc/programs/Xserver/mi/miscanfill.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miscanfill.h,v 1.4 94/04/12 17:25:27 dpw Exp $ */
+/* $XConsortium: miscanfill.h,v 1.5 94/04/17 20:27:50 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mi/miscrinit.c b/xc/programs/Xserver/mi/miscrinit.c
index 8d2bb21d2..b6a6a3909 100644
--- a/xc/programs/Xserver/mi/miscrinit.c
+++ b/xc/programs/Xserver/mi/miscrinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miscrinit.c,v 5.10 94/04/17 20:27:51 dpw Exp $ */
+/* $XConsortium: miscrinit.c,v 5.11 94/07/28 14:16:48 dpw Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/mi/mispans.c b/xc/programs/Xserver/mi/mispans.c
index 653a87c02..05c2f7264 100644
--- a/xc/programs/Xserver/mi/mispans.c
+++ b/xc/programs/Xserver/mi/mispans.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: mispans.c,v 5.4 93/09/18 10:16:47 dpw Exp $ */
+/* $XConsortium: mispans.c,v 5.5 94/04/17 20:27:52 dpw Exp $ */
#include "misc.h"
#include "pixmapstr.h"
diff --git a/xc/programs/Xserver/mi/mispans.h b/xc/programs/Xserver/mi/mispans.h
index bbd61e4e3..cc043c450 100644
--- a/xc/programs/Xserver/mi/mispans.h
+++ b/xc/programs/Xserver/mi/mispans.h
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: mispans.h,v 5.2 93/10/12 11:42:07 dpw Exp $ */
+/* $XConsortium: mispans.h,v 5.3 94/04/17 20:27:52 dpw Exp $ */
typedef struct {
int count; /* number of spans */
diff --git a/xc/programs/Xserver/mi/misprite.c b/xc/programs/Xserver/mi/misprite.c
index 4e7d27bcc..4ee42c429 100644
--- a/xc/programs/Xserver/mi/misprite.c
+++ b/xc/programs/Xserver/mi/misprite.c
@@ -4,7 +4,7 @@
* machine independent software sprite routines
*/
-/* $XConsortium: misprite.c,v 5.46 94/03/28 10:52:44 dpw Exp $ */
+/* $XConsortium: misprite.c,v 5.47 94/04/17 20:27:53 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/misprite.h b/xc/programs/Xserver/mi/misprite.h
index 52099d620..6fe1bbcb6 100644
--- a/xc/programs/Xserver/mi/misprite.h
+++ b/xc/programs/Xserver/mi/misprite.h
@@ -6,7 +6,7 @@
* mi versions of these routines exist.
*/
-/* $XConsortium: misprite.h,v 5.4 93/10/12 11:42:09 dpw Exp $ */
+/* $XConsortium: misprite.h,v 5.5 94/04/17 20:27:55 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mispritest.h b/xc/programs/Xserver/mi/mispritest.h
index 5c17bf6d3..bd2122a7c 100644
--- a/xc/programs/Xserver/mi/mispritest.h
+++ b/xc/programs/Xserver/mi/mispritest.h
@@ -4,7 +4,7 @@
* mi sprite structures
*/
-/* $XConsortium: mispritest.h,v 5.13 94/02/23 15:50:14 dpw Exp $ */
+/* $XConsortium: mispritest.h,v 5.14 94/04/17 20:27:55 dpw Exp $ */
/*
diff --git a/xc/programs/Xserver/mi/mistruct.h b/xc/programs/Xserver/mi/mistruct.h
index 53db8f316..87d5e3df1 100644
--- a/xc/programs/Xserver/mi/mistruct.h
+++ b/xc/programs/Xserver/mi/mistruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mistruct.h,v 1.2 88/09/06 15:48:57 jim Exp $ */
+/* $XConsortium: mistruct.h,v 1.3 94/04/17 20:27:56 jim Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/mi/mivalidate.h b/xc/programs/Xserver/mi/mivalidate.h
index 62a997f8e..c2655e29b 100644
--- a/xc/programs/Xserver/mi/mivalidate.h
+++ b/xc/programs/Xserver/mi/mivalidate.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mivalidate.h,v 1.2 93/10/12 11:42:13 dpw Exp $ */
+/* $XConsortium: mivalidate.h,v 1.3 94/04/17 20:27:57 dpw Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/Xserver/mi/mivaltree.c b/xc/programs/Xserver/mi/mivaltree.c
index e28dfb142..0850230eb 100644
--- a/xc/programs/Xserver/mi/mivaltree.c
+++ b/xc/programs/Xserver/mi/mivaltree.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mivaltree.c,v 5.32 94/01/07 09:45:02 dpw Exp $ */
+/* $XConsortium: mivaltree.c,v 5.33 94/04/17 20:27:58 dpw Exp $ */
/*
* mivaltree.c --
* Functions for recalculating window clip lists. Main function
diff --git a/xc/programs/Xserver/mi/miwideline.c b/xc/programs/Xserver/mi/miwideline.c
index 96e731ed2..efe9d2ae0 100644
--- a/xc/programs/Xserver/mi/miwideline.c
+++ b/xc/programs/Xserver/mi/miwideline.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miwideline.c,v 1.56 94/04/17 20:27:59 dpw Exp $ */
+/* $XConsortium: miwideline.c,v 1.57 94/07/25 13:45:31 kaleb Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/mi/miwideline.h b/xc/programs/Xserver/mi/miwideline.h
index c0dedc7dc..ee3c0efab 100644
--- a/xc/programs/Xserver/mi/miwideline.h
+++ b/xc/programs/Xserver/mi/miwideline.h
@@ -1,4 +1,4 @@
-/* $XConsortium: miwideline.h,v 1.10 94/02/23 15:50:20 dpw Exp $ */
+/* $XConsortium: miwideline.h,v 1.11 94/04/17 20:28:02 dpw Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/mi/miwindow.c b/xc/programs/Xserver/mi/miwindow.c
index 110222745..073548199 100644
--- a/xc/programs/Xserver/mi/miwindow.c
+++ b/xc/programs/Xserver/mi/miwindow.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: miwindow.c,v 5.15 94/02/04 04:17:14 dpw Exp $ */
+/* $XConsortium: miwindow.c,v 5.16 94/04/17 20:28:03 dpw Exp $ */
#include "X.h"
#include "miscstruct.h"
#include "region.h"
diff --git a/xc/programs/Xserver/mi/mizerarc.c b/xc/programs/Xserver/mi/mizerarc.c
index e7b1c85c3..50eba96a4 100644
--- a/xc/programs/Xserver/mi/mizerarc.c
+++ b/xc/programs/Xserver/mi/mizerarc.c
@@ -27,7 +27,7 @@ Author: Bob Scheifler, MIT X Consortium
********************************************************/
-/* $XConsortium: mizerarc.c,v 5.35 94/01/21 22:03:31 dpw Exp $ */
+/* $XConsortium: mizerarc.c,v 5.36 94/04/17 20:28:04 dpw Exp $ */
/* Derived from:
* "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
diff --git a/xc/programs/Xserver/mi/mizerarc.h b/xc/programs/Xserver/mi/mizerarc.h
index 3a262aaa2..84a16af9f 100644
--- a/xc/programs/Xserver/mi/mizerarc.h
+++ b/xc/programs/Xserver/mi/mizerarc.h
@@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium.
********************************************************/
-/* $XConsortium: mizerarc.h,v 5.12 94/02/23 15:50:31 dpw Exp $ */
+/* $XConsortium: mizerarc.h,v 5.13 94/04/17 20:28:04 dpw Exp $ */
typedef struct {
int x;
diff --git a/xc/programs/Xserver/mi/mizerline.c b/xc/programs/Xserver/mi/mizerline.c
index 93dfd1191..960255b7e 100644
--- a/xc/programs/Xserver/mi/mizerline.c
+++ b/xc/programs/Xserver/mi/mizerline.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: mizerline.c,v 5.8 94/07/28 14:11:16 dpw Exp dpw $ */
+/* $XConsortium: mizerline.c,v 5.9 94/08/02 15:01:29 dpw Exp $ */
#include "X.h"
#include "misc.h"
diff --git a/xc/programs/Xserver/os/Imakefile b/xc/programs/Xserver/os/Imakefile
index ef7019398..21a4eadca 100644
--- a/xc/programs/Xserver/os/Imakefile
+++ b/xc/programs/Xserver/os/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.78 94/12/02 16:29:45 mor Exp $
+XCOMM $XConsortium: Imakefile,v 1.78 94/12/02 19:23:26 mor Exp $
#include <Server.tmpl>
/*
diff --git a/xc/programs/Xserver/os/WaitFor.c b/xc/programs/Xserver/os/WaitFor.c
index 83c39043f..b51d2f731 100644
--- a/xc/programs/Xserver/os/WaitFor.c
+++ b/xc/programs/Xserver/os/WaitFor.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: WaitFor.c,v 1.69 94/08/11 15:26:33 dpw Exp kaleb $ */
+/* $XConsortium: WaitFor.c,v 1.70 95/04/05 19:58:25 kaleb Exp $ */
/*****************************************************************
* OS Dependent input routines:
diff --git a/xc/programs/Xserver/os/access.c b/xc/programs/Xserver/os/access.c
index 874d98f3f..1d06f61b1 100644
--- a/xc/programs/Xserver/os/access.c
+++ b/xc/programs/Xserver/os/access.c
@@ -1,4 +1,4 @@
-/* $XConsortium: access.c,v 1.75 94/11/21 18:27:47 kaleb Exp mor $ */
+/* $XConsortium: access.c,v 1.76 95/04/06 16:10:29 mor Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/os/auth.c b/xc/programs/Xserver/os/auth.c
index b624cc4e0..d5f5126e0 100644
--- a/xc/programs/Xserver/os/auth.c
+++ b/xc/programs/Xserver/os/auth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: auth.c,v 1.20 94/02/23 15:49:28 dpw Exp $ */
+/* $XConsortium: auth.c,v 1.21 94/04/17 20:26:54 dpw Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/os/connection.c b/xc/programs/Xserver/os/connection.c
index 43bf38100..f8dbaff36 100644
--- a/xc/programs/Xserver/os/connection.c
+++ b/xc/programs/Xserver/os/connection.c
@@ -1,4 +1,4 @@
-/* $XConsortium: connection.c,v 1.193 95/04/06 16:10:29 mor Exp dpw $ */
+/* $XConsortium: connection.c,v 1.195 95/04/25 20:33:53 dpw Exp $ */
/***********************************************************
Copyright (c) 1987, 1989 X Consortium
diff --git a/xc/programs/Xserver/os/decompress.c b/xc/programs/Xserver/os/decompress.c
index f7bec8af8..d7f471b49 100644
--- a/xc/programs/Xserver/os/decompress.c
+++ b/xc/programs/Xserver/os/decompress.c
@@ -1,4 +1,4 @@
-/* $XConsortium: decompress.c,v 1.4 94/04/12 17:24:20 dpw Exp $ */
+/* $XConsortium: decompress.c,v 1.5 94/04/17 20:26:57 dpw Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/Xserver/os/hpsocket.c b/xc/programs/Xserver/os/hpsocket.c
index f93965c22..971ace68e 100644
--- a/xc/programs/Xserver/os/hpsocket.c
+++ b/xc/programs/Xserver/os/hpsocket.c
@@ -1,4 +1,4 @@
-/* $XConsortium: hpsocket.c,v 1.2 94/04/12 17:23:43 dpw Exp $ */
+/* $XConsortium: hpsocket.c,v 1.3 94/04/17 20:26:58 dpw Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/os/io.c b/xc/programs/Xserver/os/io.c
index 6dc920b56..34d53c1fe 100644
--- a/xc/programs/Xserver/os/io.c
+++ b/xc/programs/Xserver/os/io.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: io.c,v 1.92 95/03/03 01:32:45 dpw Exp kaleb $ */
+/* $XConsortium: io.c,v 1.93 95/04/05 19:58:31 kaleb Exp $ */
/*****************************************************************
* i/o functions
*
diff --git a/xc/programs/Xserver/os/iopreader.c b/xc/programs/Xserver/os/iopreader.c
index 8586241f7..092c7a7ab 100644
--- a/xc/programs/Xserver/os/iopreader.c
+++ b/xc/programs/Xserver/os/iopreader.c
@@ -1,4 +1,4 @@
-/* $XConsortium: iopreader.c,v 1.1 94/04/01 18:15:06 dpw Exp $ */
+/* $XConsortium: iopreader.c,v 1.2 94/04/12 17:24:33 dpw Exp $ */
/* Copyright (c) 1987 by the Regents of the University of California
* Copyright (c) 1994 by the Vrije Universiteit, Amsterdam.
diff --git a/xc/programs/Xserver/os/k5auth.c b/xc/programs/Xserver/os/k5auth.c
index b6c1f3472..0442f07e4 100644
--- a/xc/programs/Xserver/os/k5auth.c
+++ b/xc/programs/Xserver/os/k5auth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: k5auth.c,v 1.8 94/04/17 20:27:02 gildea Exp mor $ */
+/* $XConsortium: k5auth.c,v 1.9 95/04/06 16:10:29 mor Exp $ */
/*
Copyright (c) 1993, 1994 X Consortium
diff --git a/xc/programs/Xserver/os/lbxio.c b/xc/programs/Xserver/os/lbxio.c
index 30bece3b4..159ef2c4d 100644
--- a/xc/programs/Xserver/os/lbxio.c
+++ b/xc/programs/Xserver/os/lbxio.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: lbxio.c,v 1.3 95/04/05 19:58:34 kaleb Exp mor $ */
+/* $XConsortium: lbxio.c,v 1.4 95/05/30 18:29:59 mor Exp $ */
/*****************************************************************
* i/o functions
*
diff --git a/xc/programs/Xserver/os/mitauth.c b/xc/programs/Xserver/os/mitauth.c
index dba37168a..8c0dda09d 100644
--- a/xc/programs/Xserver/os/mitauth.c
+++ b/xc/programs/Xserver/os/mitauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mitauth.c,v 1.7 94/03/23 19:24:13 gildea Exp $ */
+/* $XConsortium: mitauth.c,v 1.8 94/04/17 20:27:03 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/os/oscolor.c b/xc/programs/Xserver/os/oscolor.c
index f4980e3b4..4f76356b3 100644
--- a/xc/programs/Xserver/os/oscolor.c
+++ b/xc/programs/Xserver/os/oscolor.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: oscolor.c,v 1.22 94/03/31 14:01:00 dpw Exp $ */
+/* $XConsortium: oscolor.c,v 1.23 94/04/17 20:27:04 dpw Exp $ */
#ifndef USE_RGB_TXT
diff --git a/xc/programs/Xserver/os/osdep.h b/xc/programs/Xserver/os/osdep.h
index 92242bf7d..6a52cf638 100644
--- a/xc/programs/Xserver/os/osdep.h
+++ b/xc/programs/Xserver/os/osdep.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: osdep.h,v 1.40 94/04/17 20:27:05 dpw Exp kaleb $ */
+/* $XConsortium: osdep.h,v 1.41 95/04/05 19:58:36 kaleb Exp $ */
#define BOTIMEOUT 200 /* in milliseconds */
#define BUFSIZE 4096
diff --git a/xc/programs/Xserver/os/osinit.c b/xc/programs/Xserver/os/osinit.c
index fcdd682fb..71e736d38 100644
--- a/xc/programs/Xserver/os/osinit.c
+++ b/xc/programs/Xserver/os/osinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XConsortium: osinit.c,v 1.48 94/04/17 20:27:05 dpw Exp kaleb $ */
+/* $XConsortium: osinit.c,v 1.49 95/01/17 14:12:18 kaleb Exp $ */
#include <stdio.h>
#include "X.h"
diff --git a/xc/programs/Xserver/os/rpcauth.c b/xc/programs/Xserver/os/rpcauth.c
index c1de83b6a..e26fb46c3 100644
--- a/xc/programs/Xserver/os/rpcauth.c
+++ b/xc/programs/Xserver/os/rpcauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: rpcauth.c,v 1.8 94/02/08 14:55:14 gildea Exp $ */
+/* $XConsortium: rpcauth.c,v 1.9 94/04/17 20:27:06 gildea Exp $ */
/*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/Xserver/os/utils.c b/xc/programs/Xserver/os/utils.c
index 1e44830ae..d370a8798 100644
--- a/xc/programs/Xserver/os/utils.c
+++ b/xc/programs/Xserver/os/utils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: utils.c,v 1.147 94/08/16 14:03:23 dpw Exp kaleb $ */
+/* $XConsortium: utils.c,v 1.148 95/04/07 18:59:12 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/Xserver/os/xdmauth.c b/xc/programs/Xserver/os/xdmauth.c
index 46ff6575f..22a28d8e0 100644
--- a/xc/programs/Xserver/os/xdmauth.c
+++ b/xc/programs/Xserver/os/xdmauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xdmauth.c,v 1.13 94/04/17 20:27:08 gildea Exp gildea $ */
+/* $XConsortium: xdmauth.c,v 1.14 95/07/10 21:18:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/Xserver/os/xdmcp.c b/xc/programs/Xserver/os/xdmcp.c
index 5802e4533..c3fc07b3b 100644
--- a/xc/programs/Xserver/os/xdmcp.c
+++ b/xc/programs/Xserver/os/xdmcp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xdmcp.c,v 1.31 94/06/03 17:21:13 mor Exp kaleb $ */
+/* $XConsortium: xdmcp.c,v 1.32 95/04/05 19:58:35 kaleb Exp $ */
/*
* Copyright 1989 Network Computing Devices, Inc., Mountain View, California.
*
diff --git a/xc/programs/Xserver/xkb/Imakefile b/xc/programs/Xserver/xkb/Imakefile
index e5653261c..829869faa 100644
--- a/xc/programs/Xserver/xkb/Imakefile
+++ b/xc/programs/Xserver/xkb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/04/08 17:47:31 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/04/11 16:44:19 rws Exp $
#include <Server.tmpl>
SRCS = xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbStubs.c xkbSwap.c \
diff --git a/xc/programs/Xserver/xkb/xkb.c b/xc/programs/Xserver/xkb/xkb.c
index 13ff4afdb..bb44cfc6a 100644
--- a/xc/programs/Xserver/xkb/xkb.c
+++ b/xc/programs/Xserver/xkb/xkb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkb.c,v 1.5 93/09/28 22:06:21 rws Exp $ */
+/* $XConsortium: xkb.c,v 1.9 94/04/08 15:13:15 erik Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbAccessX.c b/xc/programs/Xserver/xkb/xkbAccessX.c
index 38327ac90..2f8225e24 100644
--- a/xc/programs/Xserver/xkb/xkbAccessX.c
+++ b/xc/programs/Xserver/xkb/xkbAccessX.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbAccessX.c,v 1.6 94/04/01 18:47:57 erik Exp $ */
+/* $XConsortium: xkbAccessX.c,v 1.7 94/04/07 18:37:35 erik Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbDflts.h b/xc/programs/Xserver/xkb/xkbDflts.h
index 15912c4ac..4c5e9ba54 100644
--- a/xc/programs/Xserver/xkb/xkbDflts.h
+++ b/xc/programs/Xserver/xkb/xkbDflts.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbDflts.h,v 1.3 94/04/12 17:35:00 dpw Exp $ */
+/* $XConsortium: xkbDflts.h,v 1.4 94/05/11 18:33:27 kaleb Exp $ */
/* THIS FILE GENERATED AUTOMATICALLY BY XKBCOMP */
#ifndef DFLT_H
#define DFLT_H 1
diff --git a/xc/programs/Xserver/xkb/xkbEvents.c b/xc/programs/Xserver/xkb/xkbEvents.c
index b6f72cbc4..4f0a7da1a 100644
--- a/xc/programs/Xserver/xkb/xkbEvents.c
+++ b/xc/programs/Xserver/xkb/xkbEvents.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbEvents.c,v 1.7 94/04/01 18:47:59 erik Exp $ */
+/* $XConsortium: xkbEvents.c,v 1.8 94/04/08 02:58:03 erik Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbInit.c b/xc/programs/Xserver/xkb/xkbInit.c
index 93461d182..d7fcd570b 100644
--- a/xc/programs/Xserver/xkb/xkbInit.c
+++ b/xc/programs/Xserver/xkb/xkbInit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbInit.c,v 1.7 94/05/11 18:32:14 kaleb Exp $ */
+/* $XConsortium: xkbInit.c,v 1.8 94/05/16 10:49:53 dpw Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbPrKeyEv.c b/xc/programs/Xserver/xkb/xkbPrKeyEv.c
index 338d0524e..bf7bdc6e5 100644
--- a/xc/programs/Xserver/xkb/xkbPrKeyEv.c
+++ b/xc/programs/Xserver/xkb/xkbPrKeyEv.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbPrKeyEv.c,v 1.7 93/09/29 20:53:34 rws Exp $ */
+/* $XConsortium: xkbPrKeyEv.c,v 1.1 94/04/01 18:46:13 erik Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbReadXkm.c b/xc/programs/Xserver/xkb/xkbReadXkm.c
index c160ba079..d9e52f21c 100644
--- a/xc/programs/Xserver/xkb/xkbReadXkm.c
+++ b/xc/programs/Xserver/xkb/xkbReadXkm.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkmread.c,v 1.4 93/09/28 20:16:45 rws Exp $ */
+/* $XConsortium: xkbReadXkm.c,v 1.1 94/04/08 15:15:55 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbStubs.c b/xc/programs/Xserver/xkb/xkbStubs.c
index af2e74862..257f39b4b 100644
--- a/xc/programs/Xserver/xkb/xkbStubs.c
+++ b/xc/programs/Xserver/xkb/xkbStubs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbStubs.c,v 1.4 93/09/28 19:47:41 rws Exp $ */
+/* $XConsortium: xkbStubs.c,v 1.7 94/04/02 01:05:01 erik Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbSwap.c b/xc/programs/Xserver/xkb/xkbSwap.c
index afc18409e..2f05da48f 100644
--- a/xc/programs/Xserver/xkb/xkbSwap.c
+++ b/xc/programs/Xserver/xkb/xkbSwap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbSwap.c,v 1.2 94/04/01 18:48:02 erik Exp dpw $ */
+/* $XConsortium: xkbSwap.c,v 1.3 94/09/29 15:09:19 dpw Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/Xserver/xkb/xkbUtils.c b/xc/programs/Xserver/xkb/xkbUtils.c
index 7721fbb4d..9b6399028 100644
--- a/xc/programs/Xserver/xkb/xkbUtils.c
+++ b/xc/programs/Xserver/xkb/xkbUtils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbUtils.c,v 1.13 94/04/08 15:15:07 oops Exp $ */
+/* $XConsortium: xkbUtils.c,v 1.14 94/05/09 13:07:14 dpw Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/appres/Imakefile b/xc/programs/appres/Imakefile
index 1e67ea205..057ab9391 100644
--- a/xc/programs/appres/Imakefile
+++ b/xc/programs/appres/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.3 91/07/17 16:07:46 gildea Exp $
DEPLIBS = $(DEPXTOOLLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XTOOLLIB) $(XLIB)
SRCS = appres.c
diff --git a/xc/programs/appres/appres.c b/xc/programs/appres/appres.c
index 140c458a8..db20cf329 100644
--- a/xc/programs/appres/appres.c
+++ b/xc/programs/appres/appres.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: appres.c,v 1.11 91/07/13 21:49:16 rws Exp $
+ * $XConsortium: appres.c,v 1.12 94/04/17 20:38:41 rws Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/appres/appres.man b/xc/programs/appres/appres.man
index e9baa8066..3fcc26881 100644
--- a/xc/programs/appres/appres.man
+++ b/xc/programs/appres/appres.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: appres.man,v 1.11 94/04/12 17:42:04 gildea Exp $
+.\" $XConsortium: appres.man,v 1.12 94/04/17 20:38:42 gildea Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/bdftopcf/Imakefile b/xc/programs/bdftopcf/Imakefile
index 64bafe725..1bd73aa59 100644
--- a/xc/programs/bdftopcf/Imakefile
+++ b/xc/programs/bdftopcf/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 93/08/20 11:37:04 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.7 93/09/04 17:40:29 rws Exp $
LOCAL_LIBRARIES = $(FONTLIB)
DEPLIBS = $(DEPFONTLIB)
INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include
diff --git a/xc/programs/bdftopcf/bdftopcf.c b/xc/programs/bdftopcf/bdftopcf.c
index 0d9f9ccc9..3828998f5 100644
--- a/xc/programs/bdftopcf/bdftopcf.c
+++ b/xc/programs/bdftopcf/bdftopcf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bdftopcf.c,v 1.7 93/09/17 18:38:15 gildea Exp $ */
+/* $XConsortium: bdftopcf.c,v 1.8 94/04/17 20:23:59 gildea Exp $ */
/*
Copyright (c) 1991, 1993 X Consortium
diff --git a/xc/programs/bdftopcf/bdftopcf.man b/xc/programs/bdftopcf/bdftopcf.man
index 2bae579ef..256834d21 100644
--- a/xc/programs/bdftopcf/bdftopcf.man
+++ b/xc/programs/bdftopcf/bdftopcf.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: bdftopcf.man,v 1.5 94/04/12 17:49:54 gildea Exp $
+.\" $XConsortium: bdftopcf.man,v 1.6 94/04/17 20:23:59 gildea Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/bitmap/BitEdit.c b/xc/programs/bitmap/BitEdit.c
index d6763ab53..c9bd21ca8 100644
--- a/xc/programs/bitmap/BitEdit.c
+++ b/xc/programs/bitmap/BitEdit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: BitEdit.c,v 1.27 94/03/27 13:35:52 rws Exp $ */
+/* $XConsortium: BitEdit.c,v 1.28 94/04/17 20:23:37 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Bitmap-co.ad b/xc/programs/bitmap/Bitmap-co.ad
index 9d7ed7456..4b286e447 100644
--- a/xc/programs/bitmap/Bitmap-co.ad
+++ b/xc/programs/bitmap/Bitmap-co.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Bitmap-co.ad,v 1.4 94/02/09 19:43:56 gildea Exp $
! The App-defaults file for Bitmap on a color screen.
#include "Bitmap"
diff --git a/xc/programs/bitmap/Bitmap.ad b/xc/programs/bitmap/Bitmap.ad
index dbcbd96bf..79868e801 100644
--- a/xc/programs/bitmap/Bitmap.ad
+++ b/xc/programs/bitmap/Bitmap.ad
@@ -1,4 +1,4 @@
-! $XConsortium: Bitmap.ad,v 1.18 94/02/09 19:43:57 gildea Exp kaleb $
+! $XConsortium: Bitmap.ad,v 1.19 95/06/29 19:25:34 kaleb Exp $
! The App-defaults file for Bitmap.
*TransientShell.allowShellResize: True
diff --git a/xc/programs/bitmap/Bitmap.c b/xc/programs/bitmap/Bitmap.c
index 1bab45885..32543fc78 100644
--- a/xc/programs/bitmap/Bitmap.c
+++ b/xc/programs/bitmap/Bitmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Bitmap.c,v 1.46 94/03/27 13:33:44 rws Exp $ */
+/* $XConsortium: Bitmap.c,v 1.47 94/04/17 20:23:39 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Bitmap.h b/xc/programs/bitmap/Bitmap.h
index a6ba778bf..72faa87f9 100644
--- a/xc/programs/bitmap/Bitmap.h
+++ b/xc/programs/bitmap/Bitmap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Bitmap.h,v 1.11 91/05/04 19:36:52 rws Exp $ */
+/* $XConsortium: Bitmap.h,v 1.12 94/04/17 20:23:40 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/BitmapP.h b/xc/programs/bitmap/BitmapP.h
index 329c9217e..99c7677a1 100644
--- a/xc/programs/bitmap/BitmapP.h
+++ b/xc/programs/bitmap/BitmapP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: BitmapP.h,v 1.12 93/08/19 09:25:33 rws Exp $ */
+/* $XConsortium: BitmapP.h,v 1.13 94/04/17 20:23:41 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/CutPaste.c b/xc/programs/bitmap/CutPaste.c
index 33e92e6eb..5e973f8ae 100644
--- a/xc/programs/bitmap/CutPaste.c
+++ b/xc/programs/bitmap/CutPaste.c
@@ -1,4 +1,4 @@
-/* $XConsortium: CutPaste.c,v 1.8 93/08/19 09:25:45 rws Exp $ */
+/* $XConsortium: CutPaste.c,v 1.9 94/04/17 20:23:41 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Dialog.c b/xc/programs/bitmap/Dialog.c
index dee1e3fed..a89722026 100644
--- a/xc/programs/bitmap/Dialog.c
+++ b/xc/programs/bitmap/Dialog.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Dialog.c,v 1.10 91/07/24 15:46:20 converse Exp $ */
+/* $XConsortium: Dialog.c,v 1.11 94/04/17 20:23:42 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Dialog.h b/xc/programs/bitmap/Dialog.h
index 9c3917fd7..56f5228bd 100644
--- a/xc/programs/bitmap/Dialog.h
+++ b/xc/programs/bitmap/Dialog.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Dialog.h,v 1.5 91/02/22 18:20:14 converse Exp $ */
+/* $XConsortium: Dialog.h,v 1.6 94/04/17 20:23:42 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Graphics.c b/xc/programs/bitmap/Graphics.c
index 238110081..df27763df 100644
--- a/xc/programs/bitmap/Graphics.c
+++ b/xc/programs/bitmap/Graphics.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Graphics.c,v 1.17 93/09/20 17:44:20 hersh Exp $ */
+/* $XConsortium: Graphics.c,v 1.18 94/04/17 20:23:44 hersh Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Handlers.c b/xc/programs/bitmap/Handlers.c
index d8234e65c..deebd775d 100644
--- a/xc/programs/bitmap/Handlers.c
+++ b/xc/programs/bitmap/Handlers.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Handlers.c,v 1.13 93/10/05 16:12:03 kaleb Exp $ */
+/* $XConsortium: Handlers.c,v 1.14 94/04/17 20:23:45 kaleb Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Imakefile b/xc/programs/bitmap/Imakefile
index 7e603223d..e2328f198 100644
--- a/xc/programs/bitmap/Imakefile
+++ b/xc/programs/bitmap/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.20 93/08/17 21:15:26 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.21 94/02/10 19:50:38 rws Exp $
BUTTONPICTURES = \
Dashes \
Down \
diff --git a/xc/programs/bitmap/RCS b/xc/programs/bitmap/RCS
deleted file mode 100755
index e69de29bb..000000000
--- a/xc/programs/bitmap/RCS
+++ /dev/null
diff --git a/xc/programs/bitmap/ReqMach.c b/xc/programs/bitmap/ReqMach.c
index 97a814075..944dfa658 100644
--- a/xc/programs/bitmap/ReqMach.c
+++ b/xc/programs/bitmap/ReqMach.c
@@ -1,4 +1,4 @@
-/* $XConsortium: ReqMach.c,v 1.13 93/09/20 17:44:18 hersh Exp $ */
+/* $XConsortium: ReqMach.c,v 1.14 94/04/17 20:23:45 hersh Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/Requests.h b/xc/programs/bitmap/Requests.h
index 5eddfa22b..004d10205 100644
--- a/xc/programs/bitmap/Requests.h
+++ b/xc/programs/bitmap/Requests.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Requests.h,v 1.6 93/08/19 09:25:39 rws Exp $ */
+/* $XConsortium: Requests.h,v 1.7 94/04/17 20:23:46 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/bitmap/atobm.c b/xc/programs/bitmap/atobm.c
index 2fc575927..f3f7c6ac4 100644
--- a/xc/programs/bitmap/atobm.c
+++ b/xc/programs/bitmap/atobm.c
@@ -1,4 +1,4 @@
-/* $XConsortium: atobm.c,v 1.4 93/09/20 17:44:23 hersh Exp $ */
+/* $XConsortium: atobm.c,v 1.5 94/04/17 20:23:47 hersh Exp $ */
/*
Copyright (c) 1988, 1993 X Consortium
diff --git a/xc/programs/bitmap/bitmap.man b/xc/programs/bitmap/bitmap.man
index 8c85e904b..3801a7c56 100644
--- a/xc/programs/bitmap/bitmap.man
+++ b/xc/programs/bitmap/bitmap.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: bitmap.man,v 1.15 94/04/12 17:58:06 gildea Exp $
+.\" $XConsortium: bitmap.man,v 1.16 94/04/17 20:23:48 gildea Exp $
.\" Copyright (c) 1993 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/bitmap/bmtoa.c b/xc/programs/bitmap/bmtoa.c
index 1144e2c16..bf4cc702f 100644
--- a/xc/programs/bitmap/bmtoa.c
+++ b/xc/programs/bitmap/bmtoa.c
@@ -1,4 +1,4 @@
-/* $XConsortium: bmtoa.c,v 1.5 93/09/12 14:30:27 rws Exp $ */
+/* $XConsortium: bmtoa.c,v 1.6 94/04/17 20:23:49 rws Exp $ */
/*
Copyright (c) 1988, 1993 X Consortium
diff --git a/xc/programs/editres/Edit-col.ad b/xc/programs/editres/Edit-col.ad
index dd3ca9482..11c032459 100644
--- a/xc/programs/editres/Edit-col.ad
+++ b/xc/programs/editres/Edit-col.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Edit-col.ad,v 1.6 93/04/28 14:26:45 dave Exp $
! Here are some suggested resources if you are using a color workstation.
! They look pretty good on my display, your mileage may vary.
diff --git a/xc/programs/editres/Editres.ad b/xc/programs/editres/Editres.ad
index 50de323b9..a73f2f833 100644
--- a/xc/programs/editres/Editres.ad
+++ b/xc/programs/editres/Editres.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Editres.ad,v 1.16 93/04/28 14:26:57 dave Exp $
! The App-defaults file for Editres.
Editres.Geometry: 500x600
diff --git a/xc/programs/editres/Imakefile b/xc/programs/editres/Imakefile
index 168b15956..42fc94dff 100755..100644
--- a/xc/programs/editres/Imakefile
+++ b/xc/programs/editres/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.8 91/07/16 23:07:03 gildea Exp $
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
SRCS = actions.c comm.c editres.c geometry.c handler.c setvalues.c \
diff --git a/xc/programs/editres/actions.c b/xc/programs/editres/actions.c
index 93b0febbc..8c0f6ad86 100644
--- a/xc/programs/editres/actions.c
+++ b/xc/programs/editres/actions.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: actions.c,v 1.14 93/08/19 09:24:56 rws Exp $
+ * $XConsortium: actions.c,v 1.15 94/04/17 20:38:50 rws Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/comm.c b/xc/programs/editres/comm.c
index 4cc3ce5b4..2834f9ed6 100644
--- a/xc/programs/editres/comm.c
+++ b/xc/programs/editres/comm.c
@@ -1,4 +1,4 @@
-/* $XConsortium: comm.c,v 1.22 93/04/22 14:13:05 dave Exp $ */
+/* $XConsortium: comm.c,v 1.23 94/04/17 20:38:51 dave Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/editres/editres.c b/xc/programs/editres/editres.c
index e768c9878..82ffaaa91 100644
--- a/xc/programs/editres/editres.c
+++ b/xc/programs/editres/editres.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: editres.c,v 1.17 93/08/19 09:26:38 rws Exp $
+ * $XConsortium: editres.c,v 1.18 94/04/17 20:38:52 rws Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/editres.man b/xc/programs/editres/editres.man
index bc25cbc8f..65a07fa88 100644
--- a/xc/programs/editres/editres.man
+++ b/xc/programs/editres/editres.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: editres.man,v 1.11 94/04/12 18:01:13 gildea Exp $
+.\" $XConsortium: editres.man,v 1.12 94/04/17 20:38:53 gildea Exp $
.\" Copyright (c) 1993,1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/editres/editresP.h b/xc/programs/editres/editresP.h
index 4f2ec30b1..c4ee1fa64 100644
--- a/xc/programs/editres/editresP.h
+++ b/xc/programs/editres/editresP.h
@@ -1,6 +1,6 @@
/*
- * $XConsortium: editresP.h,v 1.13 92/03/20 18:12:50 dave Exp $
+ * $XConsortium: editresP.h,v 1.14 94/04/17 20:38:54 dave Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/geometry.c b/xc/programs/editres/geometry.c
index d7e08bb44..4765ad12b 100644
--- a/xc/programs/editres/geometry.c
+++ b/xc/programs/editres/geometry.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: geometry.c,v 1.15 93/04/22 14:12:08 dave Exp $
+ * $XConsortium: geometry.c,v 1.16 94/04/17 20:38:55 dave Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/handler.c b/xc/programs/editres/handler.c
index 3d130502f..cc481fdfc 100644
--- a/xc/programs/editres/handler.c
+++ b/xc/programs/editres/handler.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: handler.c,v 1.28 93/04/22 14:12:55 dave Exp $
+ * $XConsortium: handler.c,v 1.29 94/04/17 20:38:56 dave Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/setvalues.c b/xc/programs/editres/setvalues.c
index ca8c32f4f..228a3f1e8 100644
--- a/xc/programs/editres/setvalues.c
+++ b/xc/programs/editres/setvalues.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: setvalues.c,v 1.5 93/09/20 18:06:37 hersh Exp $
+ * $XConsortium: setvalues.c,v 1.6 94/04/17 20:38:57 hersh Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/svpopup.c b/xc/programs/editres/svpopup.c
index b4ff619a6..a20b9b06e 100644
--- a/xc/programs/editres/svpopup.c
+++ b/xc/programs/editres/svpopup.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: svpopup.c,v 1.16 93/04/22 14:12:58 dave Exp $
+ * $XConsortium: svpopup.c,v 1.17 94/04/17 21:45:21 rws Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/utils.c b/xc/programs/editres/utils.c
index 6031cfcaa..31ca8b983 100644
--- a/xc/programs/editres/utils.c
+++ b/xc/programs/editres/utils.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: utils.c,v 1.21 93/09/20 18:06:32 hersh Exp $
+ * $XConsortium: utils.c,v 1.22 94/04/17 20:38:57 hersh Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/widgets.c b/xc/programs/editres/widgets.c
index 8d1945536..ec8158741 100644
--- a/xc/programs/editres/widgets.c
+++ b/xc/programs/editres/widgets.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: widgets.c,v 1.21 92/03/20 18:12:39 dave Exp $
+ * $XConsortium: widgets.c,v 1.22 94/04/17 20:38:58 dave Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/editres/wtree.c b/xc/programs/editres/wtree.c
index e04954505..277a9e618 100644
--- a/xc/programs/editres/wtree.c
+++ b/xc/programs/editres/wtree.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: wtree.c,v 1.17 93/08/19 09:27:57 rws Exp $
+ * $XConsortium: wtree.c,v 1.18 94/04/17 20:38:59 rws Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/fsinfo/Imakefile b/xc/programs/fsinfo/Imakefile
index 57b6d6def..64cbedd28 100644
--- a/xc/programs/fsinfo/Imakefile
+++ b/xc/programs/fsinfo/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 93/08/20 11:38:16 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.7 93/09/04 17:40:56 rws Exp $
LOCAL_LIBRARIES = $(FSLIB)
DEPLIBS = $(DEPFSLIB)
SRCS = fsinfo.c
diff --git a/xc/programs/fsinfo/fsinfo.c b/xc/programs/fsinfo/fsinfo.c
index 12897d4df..4a690a31f 100644
--- a/xc/programs/fsinfo/fsinfo.c
+++ b/xc/programs/fsinfo/fsinfo.c
@@ -2,7 +2,7 @@
* fsinfo -- report info about a font server
*/
-/* $XConsortium: fsinfo.c,v 1.5 94/04/17 20:24:18 dpw Exp mor $ */
+/* $XConsortium: fsinfo.c,v 1.6 95/04/06 19:50:32 mor Exp $ */
/*
Portions Copyright (c) 1987 X Consortium
diff --git a/xc/programs/fsinfo/fsinfo.man b/xc/programs/fsinfo/fsinfo.man
index 373557ffb..0944644f2 100644
--- a/xc/programs/fsinfo/fsinfo.man
+++ b/xc/programs/fsinfo/fsinfo.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: fsinfo.man,v 1.5 94/04/12 18:06:34 gildea Exp $
+.\" $XConsortium: fsinfo.man,v 1.6 94/04/17 20:24:19 gildea Exp $
.\" Copyright 1991, Network Computing Devices, Inc
.\" Copyright (c) 1993 X Consortium
.\"
diff --git a/xc/programs/fslsfonts/Imakefile b/xc/programs/fslsfonts/Imakefile
index 2c01d1887..4c609d6cb 100644
--- a/xc/programs/fslsfonts/Imakefile
+++ b/xc/programs/fslsfonts/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 93/08/20 11:39:05 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.7 93/09/04 17:41:16 rws Exp $
LOCAL_LIBRARIES = $(FSLIB)
DEPLIBS = $(DEPFSLIB)
SRCS = fslsfonts.c
diff --git a/xc/programs/fslsfonts/fslsfonts.c b/xc/programs/fslsfonts/fslsfonts.c
index bc5d194a2..743095403 100644
--- a/xc/programs/fslsfonts/fslsfonts.c
+++ b/xc/programs/fslsfonts/fslsfonts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: fslsfonts.c,v 1.6 93/09/11 18:04:20 rws Exp $ */
+/* $XConsortium: fslsfonts.c,v 1.7 94/04/17 20:38:29 rws Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/fslsfonts/fslsfonts.man b/xc/programs/fslsfonts/fslsfonts.man
index 78ce979f4..565d527d6 100644
--- a/xc/programs/fslsfonts/fslsfonts.man
+++ b/xc/programs/fslsfonts/fslsfonts.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: fslsfonts.man,v 1.5 94/04/12 18:10:46 gildea Exp $
+.\" $XConsortium: fslsfonts.man,v 1.6 94/04/17 20:38:30 gildea Exp $
.\" Copyright 1991, Network Computing Devices, Inc
.\" Copyright (c) 1993, 1994 X Consortium
.\"
diff --git a/xc/programs/fstobdf/Imakefile b/xc/programs/fstobdf/Imakefile
index 390a3b19d..811b3fefe 100644
--- a/xc/programs/fstobdf/Imakefile
+++ b/xc/programs/fstobdf/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.8 93/08/20 11:39:58 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.9 93/09/04 17:42:06 rws Exp $
LOCAL_LIBRARIES = $(FSLIB) $(XLIB)
DEPLIBS = $(DEPFSLIB) $(DEPXLIB)
INCLUDES = -I$(BUILDINCDIR)/fonts -I$(FONTINCSRC)
diff --git a/xc/programs/fstobdf/chars.c b/xc/programs/fstobdf/chars.c
index 506b38118..2f9f97c38 100644
--- a/xc/programs/fstobdf/chars.c
+++ b/xc/programs/fstobdf/chars.c
@@ -1,4 +1,4 @@
-/* $XConsortium: chars.c,v 1.3 92/11/18 21:31:24 gildea Exp $ */
+/* $XConsortium: chars.c,v 1.4 94/04/17 20:24:26 gildea Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/fstobdf/fstobdf.c b/xc/programs/fstobdf/fstobdf.c
index af78d10c0..569354399 100644
--- a/xc/programs/fstobdf/fstobdf.c
+++ b/xc/programs/fstobdf/fstobdf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: fstobdf.c,v 1.4 92/11/18 21:31:25 gildea Exp $ */
+/* $XConsortium: fstobdf.c,v 1.5 94/04/17 20:24:27 gildea Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/fstobdf/fstobdf.man b/xc/programs/fstobdf/fstobdf.man
index aa6cc5cbf..f63dfb4d2 100644
--- a/xc/programs/fstobdf/fstobdf.man
+++ b/xc/programs/fstobdf/fstobdf.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: fstobdf.man,v 1.5 94/04/12 18:15:37 gildea Exp $
+.\" $XConsortium: fstobdf.man,v 1.6 94/04/17 20:24:27 gildea Exp $
.\" Copyright 1990, Network Computing Devices
.\" Copyright (c) 1990 X Consortium
.\"
diff --git a/xc/programs/fstobdf/header.c b/xc/programs/fstobdf/header.c
index 45af1a6d9..2da3109e3 100644
--- a/xc/programs/fstobdf/header.c
+++ b/xc/programs/fstobdf/header.c
@@ -1,4 +1,4 @@
-/* $XConsortium: header.c,v 1.4 93/09/20 17:54:34 hersh Exp $ */
+/* $XConsortium: header.c,v 1.5 94/04/17 20:24:28 hersh Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/fstobdf/props.c b/xc/programs/fstobdf/props.c
index e192dfb46..9968dc537 100644
--- a/xc/programs/fstobdf/props.c
+++ b/xc/programs/fstobdf/props.c
@@ -1,4 +1,4 @@
-/* $XConsortium: props.c,v 1.3 92/11/18 21:31:27 gildea Exp $ */
+/* $XConsortium: props.c,v 1.4 94/04/17 20:24:28 gildea Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/iceauth/Imakefile b/xc/programs/iceauth/Imakefile
index 36b46a52f..91ed8029e 100644
--- a/xc/programs/iceauth/Imakefile
+++ b/xc/programs/iceauth/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 93/12/30 11:58:13 mor Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/02/04 15:39:29 mor Exp $
DEPLIBS = $(DEPICELIB)
LOCAL_LIBRARIES = $(ICELIB)
SRCS = iceauth.c process.c
diff --git a/xc/programs/iceauth/iceauth.c b/xc/programs/iceauth/iceauth.c
index b7f9074b5..96236b1a3 100644
--- a/xc/programs/iceauth/iceauth.c
+++ b/xc/programs/iceauth/iceauth.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: iceauth.c,v 1.1 93/12/30 11:58:20 mor Exp $
+ * $XConsortium: iceauth.c,v 1.2 94/04/17 20:39:54 mor Exp $
*
* xauth - manipulate authorization file
*
diff --git a/xc/programs/iceauth/iceauth.h b/xc/programs/iceauth/iceauth.h
index 10126c715..54ff9e6d2 100644
--- a/xc/programs/iceauth/iceauth.h
+++ b/xc/programs/iceauth/iceauth.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: iceauth.h,v 1.2 94/02/06 15:34:00 mor Exp $
+ * $XConsortium: iceauth.h,v 1.3 94/04/17 20:39:55 mor Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/iceauth/iceauth.man b/xc/programs/iceauth/iceauth.man
index a91917798..006469cc8 100644
--- a/xc/programs/iceauth/iceauth.man
+++ b/xc/programs/iceauth/iceauth.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: iceauth.man,v 1.3 94/04/12 18:18:22 gildea Exp $
+.\" $XConsortium: iceauth.man,v 1.4 94/04/17 20:39:55 gildea Exp $
.\" Copyright (c) 1994 X Consortium
.\"
diff --git a/xc/programs/iceauth/process.c b/xc/programs/iceauth/process.c
index 4304ca58f..cb4ae8750 100644
--- a/xc/programs/iceauth/process.c
+++ b/xc/programs/iceauth/process.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: process.c,v 1.6 94/11/14 20:31:28 mor Exp gildea $
+ * $XConsortium: process.c,v 1.7 94/12/16 22:21:15 gildea Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/mkfontdir/Imakefile b/xc/programs/mkfontdir/Imakefile
index 9886db591..119d559da 100644
--- a/xc/programs/mkfontdir/Imakefile
+++ b/xc/programs/mkfontdir/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 93/08/20 11:40:56 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.8 93/09/04 17:42:56 rws Exp $
LOCAL_LIBRARIES = $(FONTLIB)
DEPLIBS = $(DEPFONTLIB)
INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include
diff --git a/xc/programs/mkfontdir/mkfontdir.c b/xc/programs/mkfontdir/mkfontdir.c
index e4ffc1ad2..60e5a7105 100644
--- a/xc/programs/mkfontdir/mkfontdir.c
+++ b/xc/programs/mkfontdir/mkfontdir.c
@@ -46,7 +46,7 @@ SOFTWARE.
******************************************************************/
-/* $XConsortium: mkfontdir.c,v 1.11 93/09/20 18:06:01 hersh Exp $ */
+/* $XConsortium: mkfontdir.c,v 1.12 94/04/17 20:38:47 hersh Exp $ */
#ifdef WIN32
#define _WILLWINSOCK_
diff --git a/xc/programs/mkfontdir/mkfontdir.man b/xc/programs/mkfontdir/mkfontdir.man
index 89e45370b..cc7ae5998 100644
--- a/xc/programs/mkfontdir/mkfontdir.man
+++ b/xc/programs/mkfontdir/mkfontdir.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: mkfontdir.man,v 1.10 94/04/17 20:38:48 rws Exp $
+.\" $XConsortium: mkfontdir.man,v 1.11 94/04/28 15:20:57 gildea Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/oclock/Clock-col.ad b/xc/programs/oclock/Clock-col.ad
index 26f3527c6..5588c23e5 100644
--- a/xc/programs/oclock/Clock-col.ad
+++ b/xc/programs/oclock/Clock-col.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Clock-col.ad,v 1.3 94/02/09 19:43:58 gildea Exp $
Clock*Background: grey
Clock*BorderColor: light blue
Clock*hour: yellow
diff --git a/xc/programs/oclock/Clock.c b/xc/programs/oclock/Clock.c
index b33be7532..e84640ccb 100644
--- a/xc/programs/oclock/Clock.c
+++ b/xc/programs/oclock/Clock.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: Clock.c,v 1.27 94/01/18 21:31:35 rws Exp $
+ * $XConsortium: Clock.c,v 1.28 94/04/17 20:37:56 rws Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/oclock/Clock.h b/xc/programs/oclock/Clock.h
index a5603552d..8c243b449 100644
--- a/xc/programs/oclock/Clock.h
+++ b/xc/programs/oclock/Clock.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Clock.h,v 1.8 94/04/13 18:00:12 gildea Exp $ */
+/* $XConsortium: Clock.h,v 1.9 94/04/17 20:37:56 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/oclock/ClockP.h b/xc/programs/oclock/ClockP.h
index 391abba3d..342e3eb8d 100644
--- a/xc/programs/oclock/ClockP.h
+++ b/xc/programs/oclock/ClockP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ClockP.h,v 1.9 94/04/13 17:53:18 gildea Exp $ */
+/* $XConsortium: ClockP.h,v 1.10 94/04/17 20:37:57 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/oclock/Imakefile b/xc/programs/oclock/Imakefile
index efd1a7171..56073c8a1 100644
--- a/xc/programs/oclock/Imakefile
+++ b/xc/programs/oclock/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.13 92/05/15 15:29:44 converse Exp $
+XCOMM $XConsortium: Imakefile,v 1.14 93/08/17 21:16:19 rws Exp $
SYS_LIBRARIES = MathLibrary
DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB)
diff --git a/xc/programs/oclock/oclock.c b/xc/programs/oclock/oclock.c
index eedc85fe5..a9d07143f 100644
--- a/xc/programs/oclock/oclock.c
+++ b/xc/programs/oclock/oclock.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: oclock.c,v 1.16 94/04/01 17:49:16 converse Exp $
+ * $XConsortium: oclock.c,v 1.17 94/04/17 20:37:58 converse Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/oclock/oclock.man b/xc/programs/oclock/oclock.man
index 228fda526..18961d9da 100644
--- a/xc/programs/oclock/oclock.man
+++ b/xc/programs/oclock/oclock.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: oclock.man,v 1.14 94/04/12 18:25:15 gildea Exp $
+.\" $XConsortium: oclock.man,v 1.15 94/04/17 20:37:58 gildea Exp $
.\" Copyright (c) 1989 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/oclock/transform.c b/xc/programs/oclock/transform.c
index f779bb4ca..7bd5bbf13 100644
--- a/xc/programs/oclock/transform.c
+++ b/xc/programs/oclock/transform.c
@@ -1,4 +1,4 @@
-/* $XConsortium: transform.c,v 1.3 94/04/13 17:54:45 gildea Exp $ */
+/* $XConsortium: transform.c,v 1.4 94/04/17 20:37:59 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/oclock/transform.h b/xc/programs/oclock/transform.h
index 09765524e..11d2196c7 100644
--- a/xc/programs/oclock/transform.h
+++ b/xc/programs/oclock/transform.h
@@ -1,4 +1,4 @@
-/* $XConsortium: transform.h,v 1.3 94/04/13 18:01:44 gildea Exp $ */
+/* $XConsortium: transform.h,v 1.4 94/04/17 20:37:59 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/rgb/Imakefile b/xc/programs/rgb/Imakefile
index 1d47b9ea0..d1b7dbb64 100644
--- a/xc/programs/rgb/Imakefile
+++ b/xc/programs/rgb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.30 94/05/14 16:36:45 rws Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.31 94/12/08 02:28:20 kaleb Exp $
#if UseRgbTxt
RGB_DEFINES = -DUSE_RGB_TXT
diff --git a/xc/programs/rgb/rgb.c b/xc/programs/rgb/rgb.c
index 23a48dcd3..9971b8110 100644
--- a/xc/programs/rgb/rgb.c
+++ b/xc/programs/rgb/rgb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: rgb.c,v 11.19 94/04/17 20:24:45 rws Exp gildea $ */
+/* $XConsortium: rgb.c,v 11.20 94/11/28 23:39:21 gildea Exp $ */
/*
Copyright (c) 1985 X Consortium
diff --git a/xc/programs/rgb/rgb.txt b/xc/programs/rgb/rgb.txt
index 658819e4a..b11ffd058 100644
--- a/xc/programs/rgb/rgb.txt
+++ b/xc/programs/rgb/rgb.txt
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp $
255 250 250 snow
248 248 255 ghost white
248 248 255 GhostWhite
diff --git a/xc/programs/rgb/showrgb.c b/xc/programs/rgb/showrgb.c
index a1e28f9b2..9c10d8857 100644
--- a/xc/programs/rgb/showrgb.c
+++ b/xc/programs/rgb/showrgb.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: showrgb.c,v 1.10 94/03/31 14:08:32 gildea Exp $
+ * $XConsortium: showrgb.c,v 1.11 94/04/17 20:24:46 gildea Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/rgb/showrgb.man b/xc/programs/rgb/showrgb.man
index 00e083c70..8cd9afaf0 100644
--- a/xc/programs/rgb/showrgb.man
+++ b/xc/programs/rgb/showrgb.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: showrgb.man,v 1.4 94/04/13 17:27:06 gildea Exp $
+.\" $XConsortium: showrgb.man,v 1.5 94/04/17 20:24:47 gildea Exp $
.\" Copyright (c) 1993 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/rstart/Imakefile b/xc/programs/rstart/Imakefile
index 7a14b7762..17f0fa352 100644
--- a/xc/programs/rstart/Imakefile
+++ b/xc/programs/rstart/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.11 94/11/21 18:33:47 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.12 94/12/01 20:16:44 kaleb Exp $
XCOMM
XCOMM Copyright (c) 1993 Quarterdeck Office Systems
XCOMM
diff --git a/xc/programs/rstart/auth.c b/xc/programs/rstart/auth.c
index e08b650dd..86f9a7f55 100644
--- a/xc/programs/rstart/auth.c
+++ b/xc/programs/rstart/auth.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: auth.c,v 1.4 94/02/06 16:16:13 mor Exp $ */
/************************************************************************/
/* Copyright (c) 1993 Quarterdeck Office Systems */
diff --git a/xc/programs/rstart/c b/xc/programs/rstart/c
index bc909eace..19b9419fd 100644
--- a/xc/programs/rstart/c
+++ b/xc/programs/rstart/c
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: c,v 1.2 94/02/06 16:24:52 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/client.cpp b/xc/programs/rstart/client.cpp
index b68f3b998..5fbce2de5 100644
--- a/xc/programs/rstart/client.cpp
+++ b/xc/programs/rstart/client.cpp
@@ -1,5 +1,5 @@
XCOMM! /bin/sh
-XCOMM $XConsortium: client.cpp,v 1.4 94/02/06 19:51:50 mor Exp $
+XCOMM $XConsortium: client.cpp,v 1.5 94/03/29 19:43:44 mor Exp $
XCOMM
XCOMM Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/commands/@List b/xc/programs/rstart/commands/@List
index f3e30b555..344223c41 100644
--- a/xc/programs/rstart/commands/@List
+++ b/xc/programs/rstart/commands/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:25:19 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/commands/ListContexts b/xc/programs/rstart/commands/ListContexts
index 316388f2b..af6b25f7a 100755
--- a/xc/programs/rstart/commands/ListContexts
+++ b/xc/programs/rstart/commands/ListContexts
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium: ListContexts,v 1.2 94/02/06 16:25:23 mor Exp $
+# $XConsortium: ListContexts,v 1.3 94/02/06 16:34:31 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/commands/ListGenericCommands b/xc/programs/rstart/commands/ListGenericCommands
index 7fa2cf162..0ecfcb515 100755
--- a/xc/programs/rstart/commands/ListGenericCommands
+++ b/xc/programs/rstart/commands/ListGenericCommands
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium: ListGenericCommands,v 1.3 94/02/06 16:34:36 mor Exp $
+# $XConsortium: ListGenericCommands,v 1.4 94/03/29 19:44:03 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/commands/x11r6/@List b/xc/programs/rstart/commands/x11r6/@List
index 8d32d2d26..f7e6fffe6 100644
--- a/xc/programs/rstart/commands/x11r6/@List
+++ b/xc/programs/rstart/commands/x11r6/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:25:50 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/commands/x11r6/LoadMonitor b/xc/programs/rstart/commands/x11r6/LoadMonitor
index 205c1dc7d..9362d8c90 100755
--- a/xc/programs/rstart/commands/x11r6/LoadMonitor
+++ b/xc/programs/rstart/commands/x11r6/LoadMonitor
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium: LoadMonitor,v 1.2 94/02/06 16:25:53 mor Exp $
+# $XConsortium: LoadMonitor,v 1.3 94/02/06 16:35:45 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/commands/x11r6/Terminal b/xc/programs/rstart/commands/x11r6/Terminal
index 89d7459df..0a84eacf1 100755
--- a/xc/programs/rstart/commands/x11r6/Terminal
+++ b/xc/programs/rstart/commands/x11r6/Terminal
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium: Terminal,v 1.2 94/02/06 16:25:54 mor Exp $
+# $XConsortium: Terminal,v 1.3 94/02/06 16:35:49 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/config.cpp b/xc/programs/rstart/config.cpp
index 082c9b6a7..5a4d0506b 100644
--- a/xc/programs/rstart/config.cpp
+++ b/xc/programs/rstart/config.cpp
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: config.cpp,v 1.2 94/02/06 16:16:21 mor Exp $
+XCOMM $XConsortium: config.cpp,v 1.3 94/02/06 19:52:04 mor Exp $
XCOMM
XCOMM Copyright (c) 1993 Quarterdeck Office Systems
XCOMM
diff --git a/xc/programs/rstart/contexts/@Aliases b/xc/programs/rstart/contexts/@Aliases
index 4c1d51e89..1c4812eb9 100644
--- a/xc/programs/rstart/contexts/@Aliases
+++ b/xc/programs/rstart/contexts/@Aliases
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @Aliases,v 1.2 94/02/06 16:27:10 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/contexts/@List b/xc/programs/rstart/contexts/@List
index 3d37b1d89..22fc9a780 100644
--- a/xc/programs/rstart/contexts/@List
+++ b/xc/programs/rstart/contexts/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:27:14 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/contexts/default b/xc/programs/rstart/contexts/default
index 0ba478dbb..a65ff507f 100644
--- a/xc/programs/rstart/contexts/default
+++ b/xc/programs/rstart/contexts/default
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: default,v 1.2 94/02/06 16:27:15 mor Exp $
#
# Null context
diff --git a/xc/programs/rstart/contexts/x11r6 b/xc/programs/rstart/contexts/x11r6
index 53676f9a5..852e1a483 100644
--- a/xc/programs/rstart/contexts/x11r6
+++ b/xc/programs/rstart/contexts/x11r6
@@ -1,4 +1,4 @@
-# $XConsortium: x11r6,v 1.2 94/02/06 16:27:15 mor Exp $
+# $XConsortium: x11r6,v 1.3 94/02/23 12:00:41 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/rstart.man b/xc/programs/rstart/rstart.man
index 556c6f403..13f9bde1e 100644
--- a/xc/programs/rstart/rstart.man
+++ b/xc/programs/rstart/rstart.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: rstart.man,v 1.3 94/04/17 20:40:10 gildea Exp $
+.\" $XConsortium: rstart.man,v 1.4 94/04/18 18:29:53 rws Exp $
.\" Copyright (c) 1993 Quarterdeck Office Systems
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and
diff --git a/xc/programs/rstart/rstartd.man b/xc/programs/rstart/rstartd.man
index 28f56281d..88166c033 100644
--- a/xc/programs/rstart/rstartd.man
+++ b/xc/programs/rstart/rstartd.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: rstartd.man,v 1.2 94/04/11 16:03:28 matt Exp $
+.\" $XConsortium: rstartd.man,v 1.3 94/04/18 18:27:32 rws Exp $
.\" Copyright (c) 1993 Quarterdeck Office Systems
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and
diff --git a/xc/programs/rstart/samples/commands/@List b/xc/programs/rstart/samples/commands/@List
index f3e30b555..3f87a2f61 100644
--- a/xc/programs/rstart/samples/commands/@List
+++ b/xc/programs/rstart/samples/commands/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:41:29 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/samples/commands/ListContexts b/xc/programs/rstart/samples/commands/ListContexts
index 8e023f7f3..d4b880da4 100755
--- a/xc/programs/rstart/samples/commands/ListContexts
+++ b/xc/programs/rstart/samples/commands/ListContexts
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: ListContexts,v 1.2 94/02/06 16:41:32 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/ListGenericCommands b/xc/programs/rstart/samples/commands/ListGenericCommands
index 18c6e663a..c144ff3f1 100755
--- a/xc/programs/rstart/samples/commands/ListGenericCommands
+++ b/xc/programs/rstart/samples/commands/ListGenericCommands
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: ListGenericCommands,v 1.2 94/02/06 16:41:33 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/odt1/@List b/xc/programs/rstart/samples/commands/odt1/@List
index eb4e852d9..41b1d2556 100644
--- a/xc/programs/rstart/samples/commands/odt1/@List
+++ b/xc/programs/rstart/samples/commands/odt1/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:44:19 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
#
diff --git a/xc/programs/rstart/samples/commands/odt1/LoadMonitor b/xc/programs/rstart/samples/commands/odt1/LoadMonitor
index 36d3f8665..24f9808f5 100755
--- a/xc/programs/rstart/samples/commands/odt1/LoadMonitor
+++ b/xc/programs/rstart/samples/commands/odt1/LoadMonitor
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: LoadMonitor,v 1.2 94/02/06 16:44:23 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/odt1/Terminal b/xc/programs/rstart/samples/commands/odt1/Terminal
index ee4c0cf78..c55b2bdad 100755
--- a/xc/programs/rstart/samples/commands/odt1/Terminal
+++ b/xc/programs/rstart/samples/commands/odt1/Terminal
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: Terminal,v 1.2 94/02/06 16:44:24 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/openwindows2/@List b/xc/programs/rstart/samples/commands/openwindows2/@List
index fbe974417..cd7918473 100644
--- a/xc/programs/rstart/samples/commands/openwindows2/@List
+++ b/xc/programs/rstart/samples/commands/openwindows2/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:44:46 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/openwindows2/LoadMonitor b/xc/programs/rstart/samples/commands/openwindows2/LoadMonitor
index 7c2aa04c8..3b752307c 100755
--- a/xc/programs/rstart/samples/commands/openwindows2/LoadMonitor
+++ b/xc/programs/rstart/samples/commands/openwindows2/LoadMonitor
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: LoadMonitor,v 1.2 94/02/06 16:44:51 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/openwindows2/Terminal b/xc/programs/rstart/samples/commands/openwindows2/Terminal
index 2d662e42a..b4d07dbdb 100755
--- a/xc/programs/rstart/samples/commands/openwindows2/Terminal
+++ b/xc/programs/rstart/samples/commands/openwindows2/Terminal
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: Terminal,v 1.2 94/02/06 16:44:52 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/openwindows3/@List b/xc/programs/rstart/samples/commands/openwindows3/@List
index fbe974417..0236660a0 100644
--- a/xc/programs/rstart/samples/commands/openwindows3/@List
+++ b/xc/programs/rstart/samples/commands/openwindows3/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:45:16 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/openwindows3/LoadMonitor b/xc/programs/rstart/samples/commands/openwindows3/LoadMonitor
index 7c2aa04c8..ffc8ccde6 100755
--- a/xc/programs/rstart/samples/commands/openwindows3/LoadMonitor
+++ b/xc/programs/rstart/samples/commands/openwindows3/LoadMonitor
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: LoadMonitor,v 1.2 94/02/06 16:45:20 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/openwindows3/Terminal b/xc/programs/rstart/samples/commands/openwindows3/Terminal
index 2d662e42a..2b8f6a728 100755
--- a/xc/programs/rstart/samples/commands/openwindows3/Terminal
+++ b/xc/programs/rstart/samples/commands/openwindows3/Terminal
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: Terminal,v 1.2 94/02/06 16:45:21 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/x11r5/@List b/xc/programs/rstart/samples/commands/x11r5/@List
index e0bbfbc11..8935bfcc6 100644
--- a/xc/programs/rstart/samples/commands/x11r5/@List
+++ b/xc/programs/rstart/samples/commands/x11r5/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:45:32 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/x11r5/LoadMonitor b/xc/programs/rstart/samples/commands/x11r5/LoadMonitor
index 36d3f8665..803925055 100755
--- a/xc/programs/rstart/samples/commands/x11r5/LoadMonitor
+++ b/xc/programs/rstart/samples/commands/x11r5/LoadMonitor
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: LoadMonitor,v 1.2 94/02/06 16:45:35 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/commands/x11r5/Terminal b/xc/programs/rstart/samples/commands/x11r5/Terminal
index ee4c0cf78..322fcef7b 100755
--- a/xc/programs/rstart/samples/commands/x11r5/Terminal
+++ b/xc/programs/rstart/samples/commands/x11r5/Terminal
@@ -1,5 +1,5 @@
#! /bin/sh
-# $XConsortium$
+# $XConsortium: Terminal,v 1.2 94/02/06 16:45:37 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.odt1/@Aliases b/xc/programs/rstart/samples/contexts.odt1/@Aliases
index dbe0410e7..484cbb857 100644
--- a/xc/programs/rstart/samples/contexts.odt1/@Aliases
+++ b/xc/programs/rstart/samples/contexts.odt1/@Aliases
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @Aliases,v 1.2 94/02/06 16:49:46 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.odt1/@List b/xc/programs/rstart/samples/contexts.odt1/@List
index 8486582b7..d98d57799 100644
--- a/xc/programs/rstart/samples/contexts.odt1/@List
+++ b/xc/programs/rstart/samples/contexts.odt1/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:49:54 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.odt1/default b/xc/programs/rstart/samples/contexts.odt1/default
index 0ba478dbb..f1b9a93b0 100644
--- a/xc/programs/rstart/samples/contexts.odt1/default
+++ b/xc/programs/rstart/samples/contexts.odt1/default
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: default,v 1.2 94/02/06 16:49:55 mor Exp $
#
# Null context
diff --git a/xc/programs/rstart/samples/contexts.odt1/odt1 b/xc/programs/rstart/samples/contexts.odt1/odt1
index 7e128d108..c268138e3 100644
--- a/xc/programs/rstart/samples/contexts.odt1/odt1
+++ b/xc/programs/rstart/samples/contexts.odt1/odt1
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: odt1,v 1.2 94/02/06 16:49:56 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.sun/@Aliases b/xc/programs/rstart/samples/contexts.sun/@Aliases
index 409d895a8..8e81ca956 100644
--- a/xc/programs/rstart/samples/contexts.sun/@Aliases
+++ b/xc/programs/rstart/samples/contexts.sun/@Aliases
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @Aliases,v 1.2 94/02/06 16:51:10 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.sun/@List b/xc/programs/rstart/samples/contexts.sun/@List
index 450ef5e99..3b1d71912 100644
--- a/xc/programs/rstart/samples/contexts.sun/@List
+++ b/xc/programs/rstart/samples/contexts.sun/@List
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: @List,v 1.2 94/02/06 16:51:16 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.sun/default b/xc/programs/rstart/samples/contexts.sun/default
index 0ba478dbb..f22a3d02a 100644
--- a/xc/programs/rstart/samples/contexts.sun/default
+++ b/xc/programs/rstart/samples/contexts.sun/default
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: default,v 1.2 94/02/06 16:51:17 mor Exp $
#
# Null context
diff --git a/xc/programs/rstart/samples/contexts.sun/openwindows2 b/xc/programs/rstart/samples/contexts.sun/openwindows2
index ea351cea0..178968cf9 100644
--- a/xc/programs/rstart/samples/contexts.sun/openwindows2
+++ b/xc/programs/rstart/samples/contexts.sun/openwindows2
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: openwindows2,v 1.2 94/02/06 16:51:18 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.sun/openwindows3 b/xc/programs/rstart/samples/contexts.sun/openwindows3
index af2ca35d8..6d1993236 100644
--- a/xc/programs/rstart/samples/contexts.sun/openwindows3
+++ b/xc/programs/rstart/samples/contexts.sun/openwindows3
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: openwindows3,v 1.2 94/02/06 16:51:19 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.sun/x11r5 b/xc/programs/rstart/samples/contexts.sun/x11r5
index 615607b45..588cf75b8 100644
--- a/xc/programs/rstart/samples/contexts.sun/x11r5
+++ b/xc/programs/rstart/samples/contexts.sun/x11r5
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: x11r5,v 1.2 94/02/06 16:51:20 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/samples/contexts.sun/x11r6 b/xc/programs/rstart/samples/contexts.sun/x11r6
index 10b826599..7b66a3630 100644
--- a/xc/programs/rstart/samples/contexts.sun/x11r6
+++ b/xc/programs/rstart/samples/contexts.sun/x11r6
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: x11r6,v 1.2 94/02/06 16:51:21 mor Exp $
#
# Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/rstart/server.c b/xc/programs/rstart/server.c
index 8fe85b447..d90de34a8 100644
--- a/xc/programs/rstart/server.c
+++ b/xc/programs/rstart/server.c
@@ -1,4 +1,4 @@
-/* $XConsortium: server.c,v 1.11 94/10/04 20:36:38 mor Exp mor $ */
+/* $XConsortium: server.c,v 1.12 94/12/30 18:48:43 mor Exp $ */
/************************************************************************/
/* Copyright (c) 1993 Quarterdeck Office Systems */
diff --git a/xc/programs/rstart/server.cpp b/xc/programs/rstart/server.cpp
index 66400ffa5..5fa728fea 100755
--- a/xc/programs/rstart/server.cpp
+++ b/xc/programs/rstart/server.cpp
@@ -1,5 +1,5 @@
XCOMM! /bin/sh
-XCOMM $XConsortium: server.cpp,v 1.3 94/02/06 16:32:49 mor Exp $
+XCOMM $XConsortium: server.cpp,v 1.4 94/02/06 19:52:05 mor Exp $
XCOMM
XCOMM Copyright (c) 1993 Quarterdeck Office Systems
diff --git a/xc/programs/scripts/Imakefile b/xc/programs/scripts/Imakefile
index 15aa85f3a..0e0b20cdf 100644
--- a/xc/programs/scripts/Imakefile
+++ b/xc/programs/scripts/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.26 93/09/04 17:51:51 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.27 94/02/10 16:55:34 rws Exp $
all::
diff --git a/xc/programs/scripts/xon.man b/xc/programs/scripts/xon.man
index ad80dea0d..dc1eaebda 100644
--- a/xc/programs/scripts/xon.man
+++ b/xc/programs/scripts/xon.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xon.man,v 1.5 94/04/13 17:29:04 gildea Exp $
+.\" $XConsortium: xon.man,v 1.6 94/04/17 20:39:52 gildea Exp $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xc/programs/scripts/xon.sh b/xc/programs/scripts/xon.sh
index f15be9eff..7c7a5ef80 100755
--- a/xc/programs/scripts/xon.sh
+++ b/xc/programs/scripts/xon.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XConsortium: xon.sh,v 1.9 94/10/04 20:37:58 mor Exp gildea $
+# $XConsortium: xon.sh,v 1.10 94/12/09 22:53:55 gildea Exp $
# start up xterm (or any other X command) on the specified host
# Usage: xon host [arguments] [command]
case $# in
diff --git a/xc/programs/smproxy/Imakefile b/xc/programs/smproxy/Imakefile
index f03348fef..3b9fd0b50 100644
--- a/xc/programs/smproxy/Imakefile
+++ b/xc/programs/smproxy/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/06/06 11:31:25 mor Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/07/06 16:26:46 mor Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB)
SRCS = smproxy.c save.c
diff --git a/xc/programs/smproxy/save.c b/xc/programs/smproxy/save.c
index cc8112fb8..2e82ac753 100644
--- a/xc/programs/smproxy/save.c
+++ b/xc/programs/smproxy/save.c
@@ -1,4 +1,4 @@
-/* $XConsortium: save.c,v 1.4 94/12/27 18:46:57 mor Exp mor $ */
+/* $XConsortium: save.c,v 1.5 94/12/30 15:38:08 mor Exp $ */
/******************************************************************************
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/smproxy/smproxy.c b/xc/programs/smproxy/smproxy.c
index f47288593..af9ad7afa 100644
--- a/xc/programs/smproxy/smproxy.c
+++ b/xc/programs/smproxy/smproxy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: smproxy.c,v 1.28 95/01/04 22:28:03 mor Exp mor $ */
+/* $XConsortium: smproxy.c,v 1.29 95/04/04 15:17:40 mor Exp $ */
/******************************************************************************
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/smproxy/smproxy.h b/xc/programs/smproxy/smproxy.h
index b958e9eab..8e2f1531b 100644
--- a/xc/programs/smproxy/smproxy.h
+++ b/xc/programs/smproxy/smproxy.h
@@ -1,4 +1,4 @@
-/* $XConsortium: smproxy.h,v 1.6 94/11/30 16:17:13 mor Exp mor $ */
+/* $XConsortium: smproxy.h,v 1.7 94/12/27 18:47:54 mor Exp $ */
/******************************************************************************
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/smproxy/smproxy.man b/xc/programs/smproxy/smproxy.man
index 75d092bd9..f7fd45bc9 100644
--- a/xc/programs/smproxy/smproxy.man
+++ b/xc/programs/smproxy/smproxy.man
@@ -1,4 +1,4 @@
-.\" $XConsortium$
+.\" $XConsortium: smproxy.man,v 1.1 94/12/27 18:46:38 mor Exp $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/twm/Imakefile b/xc/programs/twm/Imakefile
index fbc1ef09d..510b88d8d 100644
--- a/xc/programs/twm/Imakefile
+++ b/xc/programs/twm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/06/14 20:11:42 mor Exp $
+XCOMM $XConsortium: Imakefile,v 1.41 94/07/06 16:15:19 mor Exp $
YFLAGS = -d
DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
diff --git a/xc/programs/twm/add_window.c b/xc/programs/twm/add_window.c
index 9b4c1277e..305539d4c 100644
--- a/xc/programs/twm/add_window.c
+++ b/xc/programs/twm/add_window.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: add_window.c,v 1.163 94/10/04 19:59:13 mor Exp mor $
+ * $XConsortium: add_window.c,v 1.164 94/12/27 19:16:56 mor Exp $
*
* Add a new window, put the titlbar and other stuff around
* the window
diff --git a/xc/programs/twm/add_window.h b/xc/programs/twm/add_window.h
index f422e35c0..70a386e9a 100644
--- a/xc/programs/twm/add_window.h
+++ b/xc/programs/twm/add_window.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: add_window.h,v 1.7 90/04/17 14:04:33 jim Exp $
+ * $XConsortium: add_window.h,v 1.8 94/04/17 20:38:05 jim Exp $
*
* AddWindow include file
*
diff --git a/xc/programs/twm/cursor.c b/xc/programs/twm/cursor.c
index 59b1ca9dd..c22277446 100644
--- a/xc/programs/twm/cursor.c
+++ b/xc/programs/twm/cursor.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: cursor.c,v 1.11 92/08/24 15:34:51 rws Exp $
+ * $XConsortium: cursor.c,v 1.12 94/04/17 20:38:05 rws Exp $
*
* cursor creation code
*
diff --git a/xc/programs/twm/events.c b/xc/programs/twm/events.c
index 1dbab76a2..9510ae0fd 100644
--- a/xc/programs/twm/events.c
+++ b/xc/programs/twm/events.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: events.c,v 1.189 94/07/21 16:04:41 mor Exp $
+ * $XConsortium: events.c,v 1.190 94/07/21 17:46:35 mor Exp $
*
* twm event handling
*
diff --git a/xc/programs/twm/events.h b/xc/programs/twm/events.h
index b0a8da61f..aae687564 100644
--- a/xc/programs/twm/events.h
+++ b/xc/programs/twm/events.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: events.h,v 1.14 91/05/10 17:53:58 dave Exp $
+ * $XConsortium: events.h,v 1.15 94/04/17 20:38:09 dave Exp $
*
* twm event handler include file
*
diff --git a/xc/programs/twm/gc.c b/xc/programs/twm/gc.c
index 03172a331..f17a2d189 100644
--- a/xc/programs/twm/gc.c
+++ b/xc/programs/twm/gc.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: gc.c,v 1.22 91/01/09 17:13:12 rws Exp $
+ * $XConsortium: gc.c,v 1.23 94/04/17 20:38:09 rws Exp $
*
* Open the fonts and create the GCs
*
diff --git a/xc/programs/twm/gc.h b/xc/programs/twm/gc.h
index 498934ec2..d2f2eba83 100644
--- a/xc/programs/twm/gc.h
+++ b/xc/programs/twm/gc.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: gc.h,v 1.5 89/10/27 14:01:17 jim Exp $
+ * $XConsortium: gc.h,v 1.6 94/04/17 20:38:10 jim Exp $
*
* GC related externs
*
diff --git a/xc/programs/twm/gram.y b/xc/programs/twm/gram.y
index f4ccf3741..47320d93f 100644
--- a/xc/programs/twm/gram.y
+++ b/xc/programs/twm/gram.y
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: gram.y,v 1.92 92/05/11 15:05:44 dave Exp $
+ * $XConsortium: gram.y,v 1.93 94/04/17 20:38:11 dave Exp $
*
* .twmrc command grammer
*
diff --git a/xc/programs/twm/iconmgr.c b/xc/programs/twm/iconmgr.c
index 29ec22cf5..2508ab23c 100644
--- a/xc/programs/twm/iconmgr.c
+++ b/xc/programs/twm/iconmgr.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: iconmgr.c,v 1.48 91/09/10 15:27:07 dave Exp $
+ * $XConsortium: iconmgr.c,v 1.49 94/04/17 20:38:12 dave Exp $
*
* Icon Manager routines
*
diff --git a/xc/programs/twm/iconmgr.h b/xc/programs/twm/iconmgr.h
index 2af3811a5..8a03fb630 100644
--- a/xc/programs/twm/iconmgr.h
+++ b/xc/programs/twm/iconmgr.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: iconmgr.h,v 1.11 89/12/10 17:47:02 jim Exp $
+ * $XConsortium: iconmgr.h,v 1.12 94/04/17 20:38:13 jim Exp $
*
* Icon Manager includes
*
diff --git a/xc/programs/twm/icons.c b/xc/programs/twm/icons.c
index 94ab1c585..68aff216c 100644
--- a/xc/programs/twm/icons.c
+++ b/xc/programs/twm/icons.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: icons.c,v 1.22 91/07/12 09:58:38 dave Exp $
+ * $XConsortium: icons.c,v 1.23 94/04/17 20:38:13 dave Exp $
*
* Icon releated routines
*
diff --git a/xc/programs/twm/icons.h b/xc/programs/twm/icons.h
index dcea4cd59..599e5f8ed 100644
--- a/xc/programs/twm/icons.h
+++ b/xc/programs/twm/icons.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: icons.h,v 1.4 89/07/18 17:16:24 jim Exp $
+ * $XConsortium: icons.h,v 1.5 94/04/17 20:38:14 jim Exp $
*
* Icon releated definitions
*
diff --git a/xc/programs/twm/lex.l b/xc/programs/twm/lex.l
index 6e8c4d0f5..4acfaf563 100644
--- a/xc/programs/twm/lex.l
+++ b/xc/programs/twm/lex.l
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: lex.l,v 1.69 94/11/21 18:33:32 kaleb Exp Kaleb $
+ * $XConsortium: lex.l,v 1.70 95/03/01 16:37:51 kaleb Exp $
*
* .twmrc lex file
*
diff --git a/xc/programs/twm/list.c b/xc/programs/twm/list.c
index 1d318ff53..9fd6609e9 100644
--- a/xc/programs/twm/list.c
+++ b/xc/programs/twm/list.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: list.c,v 1.20 91/01/09 17:13:30 rws Exp $
+ * $XConsortium: list.c,v 1.21 94/04/17 20:38:15 rws Exp $
*
* TWM code to deal with the name lists for the NoTitle list and
* the AutoRaise list
diff --git a/xc/programs/twm/list.h b/xc/programs/twm/list.h
index e2f0d5ecb..1be5cd677 100644
--- a/xc/programs/twm/list.h
+++ b/xc/programs/twm/list.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: list.h,v 1.12 90/09/14 14:54:42 converse Exp $
+ * $XConsortium: list.h,v 1.13 94/04/17 20:38:16 converse Exp $
*
* TWM list handling external definitions
*
diff --git a/xc/programs/twm/menus.c b/xc/programs/twm/menus.c
index d52c047ae..80a82fef3 100644
--- a/xc/programs/twm/menus.c
+++ b/xc/programs/twm/menus.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: menus.c,v 1.196 94/05/12 16:55:46 kaleb Exp mor $
+ * $XConsortium: menus.c,v 1.197 94/08/10 19:57:54 mor Exp $
*
* twm menu code
*
diff --git a/xc/programs/twm/menus.h b/xc/programs/twm/menus.h
index 95a6aa39f..a608fb4f9 100644
--- a/xc/programs/twm/menus.h
+++ b/xc/programs/twm/menus.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: menus.h,v 1.24 89/12/10 17:46:26 jim Exp $
+ * $XConsortium: menus.h,v 1.25 94/04/17 20:38:18 jim Exp $
*
* twm menus include file
*
diff --git a/xc/programs/twm/parse.c b/xc/programs/twm/parse.c
index bccfca21c..3dc62e233 100644
--- a/xc/programs/twm/parse.c
+++ b/xc/programs/twm/parse.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: parse.c,v 1.56 93/09/03 09:55:35 dpw Exp $
+ * $XConsortium: parse.c,v 1.57 94/04/17 20:38:19 dpw Exp $
*
* parse the .twmrc file
*
diff --git a/xc/programs/twm/parse.h b/xc/programs/twm/parse.h
index 136429b28..8ab356760 100644
--- a/xc/programs/twm/parse.h
+++ b/xc/programs/twm/parse.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: parse.h,v 1.15 93/09/02 11:11:46 dpw Exp $
+ * $XConsortium: parse.h,v 1.16 94/04/17 20:38:20 dpw Exp $
*
* .twmrc parsing externs
*
diff --git a/xc/programs/twm/resize.c b/xc/programs/twm/resize.c
index 86c94d6c1..05258c928 100644
--- a/xc/programs/twm/resize.c
+++ b/xc/programs/twm/resize.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: resize.c,v 1.81 94/04/17 20:38:21 dave Exp mor $
+ * $XConsortium: resize.c,v 1.82 94/12/27 19:07:15 mor Exp $
*
* window resizing borrowed from the "wm" window manager
*
diff --git a/xc/programs/twm/resize.h b/xc/programs/twm/resize.h
index bc9634493..3a20bc68f 100644
--- a/xc/programs/twm/resize.h
+++ b/xc/programs/twm/resize.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: resize.h,v 1.7 90/03/23 11:42:32 jim Exp $
+ * $XConsortium: resize.h,v 1.8 94/04/17 20:38:21 jim Exp $
*
* resize function externs
*
diff --git a/xc/programs/twm/screen.h b/xc/programs/twm/screen.h
index 120a7de49..08da90c16 100644
--- a/xc/programs/twm/screen.h
+++ b/xc/programs/twm/screen.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: screen.h,v 1.63 92/08/24 15:35:14 rws Exp $
+ * $XConsortium: screen.h,v 1.64 94/04/17 20:38:22 rws Exp $
*
* twm per-screen data include file
*
diff --git a/xc/programs/twm/session.c b/xc/programs/twm/session.c
index 0e2ea9082..a264a452c 100644
--- a/xc/programs/twm/session.c
+++ b/xc/programs/twm/session.c
@@ -1,4 +1,4 @@
-/* $XConsortium: session.c,v 1.18 95/01/04 22:28:37 mor Exp Kaleb $ */
+/* $XConsortium: session.c,v 1.19 95/04/07 19:22:37 kaleb Exp $ */
/******************************************************************************
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/twm/system.twmrc b/xc/programs/twm/system.twmrc
index dfe0e7f29..952990217 100644
--- a/xc/programs/twm/system.twmrc
+++ b/xc/programs/twm/system.twmrc
@@ -1,5 +1,5 @@
#
-# $XConsortium: system.twmrc,v 1.7 89/12/01 11:23:47 jim Exp $
+# $XConsortium: system.twmrc,v 1.8 91/04/23 21:10:58 gildea Exp $
#
# Default twm configuration file; needs to be kept small to conserve string
# space in systems whose compilers don't handle medium-sized strings.
diff --git a/xc/programs/twm/twm.c b/xc/programs/twm/twm.c
index 1137eea9c..b32874221 100644
--- a/xc/programs/twm/twm.c
+++ b/xc/programs/twm/twm.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: twm.c,v 1.134 94/12/27 19:18:18 mor Exp mor $
+ * $XConsortium: twm.c,v 1.135 94/12/27 20:52:15 mor Exp $
*
* twm - "Tom's Window Manager"
*
diff --git a/xc/programs/twm/twm.h b/xc/programs/twm/twm.h
index 28ed3e420..4b6b138b2 100644
--- a/xc/programs/twm/twm.h
+++ b/xc/programs/twm/twm.h
@@ -55,7 +55,7 @@ from the X Consortium.
/***********************************************************************
*
- * $XConsortium: twm.h,v 1.83 94/09/14 18:20:02 mor Exp mor $
+ * $XConsortium: twm.h,v 1.84 94/12/27 19:05:22 mor Exp $
*
* twm include file
*
diff --git a/xc/programs/twm/twm.man b/xc/programs/twm/twm.man
index 4266cfdb3..b237348b7 100644
--- a/xc/programs/twm/twm.man
+++ b/xc/programs/twm/twm.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: twm.man,v 1.62 94/04/12 17:47:41 gildea Exp $
+.\" $XConsortium: twm.man,v 1.63 94/04/17 20:38:25 gildea Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\" Portions copyright 1988 Evans & Sutherland Computer Corporation.
.\" Portions copyright 1989 Hewlett-Packard Company
diff --git a/xc/programs/twm/util.c b/xc/programs/twm/util.c
index 3fcb4d77a..d25633af2 100644
--- a/xc/programs/twm/util.c
+++ b/xc/programs/twm/util.c
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: util.c,v 1.48 92/08/24 15:35:32 rws Exp $
+ * $XConsortium: util.c,v 1.49 94/04/17 20:38:26 rws Exp $
*
* utility routines for twm
*
diff --git a/xc/programs/twm/util.h b/xc/programs/twm/util.h
index c06b162b2..2fe5f0b94 100644
--- a/xc/programs/twm/util.h
+++ b/xc/programs/twm/util.h
@@ -53,7 +53,7 @@ in this Software without prior written authorization from the X Consortium.
/***********************************************************************
*
- * $XConsortium: util.h,v 1.10 89/12/10 17:47:04 jim Exp $
+ * $XConsortium: util.h,v 1.11 94/04/17 20:38:27 jim Exp $
*
* utility routines header file
*
diff --git a/xc/programs/twm/version.c b/xc/programs/twm/version.c
index 62365f40c..09d649adf 100644
--- a/xc/programs/twm/version.c
+++ b/xc/programs/twm/version.c
@@ -50,6 +50,6 @@ in this Software without prior written authorization from the X Consortium.
/** OR PERFORMANCE OF THIS SOFTWARE. **/
/*****************************************************************************/
-/* $XConsortium: version.c,v 6.8 93/10/07 14:52:26 gildea Exp $ */
+/* $XConsortium: version.c,v 6.9 94/04/17 20:38:27 gildea Exp $ */
char *Version = "X Consortium, R6";
diff --git a/xc/programs/twm/version.h b/xc/programs/twm/version.h
index afd03b9b1..9d5adecc8 100644
--- a/xc/programs/twm/version.h
+++ b/xc/programs/twm/version.h
@@ -52,7 +52,7 @@ in this Software without prior written authorization from the X Consortium.
/**********************************************************************
*
- * $XConsortium: version.h,v 1.7 89/10/27 14:01:42 jim Exp $
+ * $XConsortium: version.h,v 1.8 94/04/17 20:38:28 jim Exp $
*
* TWM version externs
*
diff --git a/xc/programs/x11perf/Imakefile b/xc/programs/x11perf/Imakefile
index ebe66329c..b0a6f1d3d 100644
--- a/xc/programs/x11perf/Imakefile
+++ b/xc/programs/x11perf/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 2.30 93/08/24 18:48:22 rws Exp $
+XCOMM $XConsortium: Imakefile,v 2.31 93/09/04 19:58:26 rws Exp $
#ifndef X11perfcompLib
#define X11perfcompLib $(LIBDIR)/x11perfcomp
#endif
diff --git a/xc/programs/x11perf/Xmark.sh b/xc/programs/x11perf/Xmark.sh
index 5c391fa3c..81dfe745d 100755
--- a/xc/programs/x11perf/Xmark.sh
+++ b/xc/programs/x11perf/Xmark.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-#$XConsortium: Xmark.sh,v 1.5 93/04/23 18:28:44 rws Exp gildea $
+#$XConsortium: Xmark.sh,v 1.6 94/12/09 22:52:57 gildea Exp $
#XPC Header: Xmark,v 1.15 93/04/12 10:10:07 hmgr Exp
#
############################################################
diff --git a/xc/programs/x11perf/bitmaps.c b/xc/programs/x11perf/bitmaps.c
index 2f8a6aeab..5ceb7f4e0 100644
--- a/xc/programs/x11perf/bitmaps.c
+++ b/xc/programs/x11perf/bitmaps.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: bitmaps.c,v 1.6 92/11/11 17:02:11 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/bitmaps.h b/xc/programs/x11perf/bitmaps.h
index 258993684..78f46207f 100644
--- a/xc/programs/x11perf/bitmaps.h
+++ b/xc/programs/x11perf/bitmaps.h
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: bitmaps.h,v 1.2 94/02/06 20:17:23 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_arcs.c b/xc/programs/x11perf/do_arcs.c
index 1fd06c07d..fb30e9893 100644
--- a/xc/programs/x11perf/do_arcs.c
+++ b/xc/programs/x11perf/do_arcs.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_arcs.c,v 2.12 92/11/11 17:01:12 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_blt.c b/xc/programs/x11perf/do_blt.c
index fc680a6f9..1e8acec54 100644
--- a/xc/programs/x11perf/do_blt.c
+++ b/xc/programs/x11perf/do_blt.c
@@ -1,4 +1,4 @@
-/* $XConsortium: do_blt.c,v 2.16 94/02/28 21:57:25 dpw Exp $ */
+/* $XConsortium: do_blt.c,v 2.17 94/03/17 20:23:46 dpw Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_complex.c b/xc/programs/x11perf/do_complex.c
index 25226f3e9..bcfa93da4 100644
--- a/xc/programs/x11perf/do_complex.c
+++ b/xc/programs/x11perf/do_complex.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_complex.c,v 2.7 92/07/31 17:02:47 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_dots.c b/xc/programs/x11perf/do_dots.c
index 9b269fbca..71978e370 100644
--- a/xc/programs/x11perf/do_dots.c
+++ b/xc/programs/x11perf/do_dots.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_dots.c,v 2.5 94/02/06 20:17:34 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_lines.c b/xc/programs/x11perf/do_lines.c
index 97985538e..cc1de0efe 100644
--- a/xc/programs/x11perf/do_lines.c
+++ b/xc/programs/x11perf/do_lines.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_lines.c,v 2.11 92/11/11 16:58:34 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_movewin.c b/xc/programs/x11perf/do_movewin.c
index 907f95f68..c442e8e39 100644
--- a/xc/programs/x11perf/do_movewin.c
+++ b/xc/programs/x11perf/do_movewin.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_movewin.c,v 2.5 94/02/06 20:17:39 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_rects.c b/xc/programs/x11perf/do_rects.c
index 8913c22da..f676c2c6d 100644
--- a/xc/programs/x11perf/do_rects.c
+++ b/xc/programs/x11perf/do_rects.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_rects.c,v 2.10 94/02/06 20:17:29 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_segs.c b/xc/programs/x11perf/do_segs.c
index 23f1da81c..841f49f8c 100644
--- a/xc/programs/x11perf/do_segs.c
+++ b/xc/programs/x11perf/do_segs.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_segs.c,v 2.15 92/11/11 17:01:50 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_simple.c b/xc/programs/x11perf/do_simple.c
index fe1f21044..d55a8f62c 100644
--- a/xc/programs/x11perf/do_simple.c
+++ b/xc/programs/x11perf/do_simple.c
@@ -1,4 +1,4 @@
-/* $XConsortium: do_simple.c,v 2.10 94/02/28 21:56:40 dpw Exp $ */
+/* $XConsortium: do_simple.c,v 2.11 94/03/17 20:24:36 dpw Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_tests.c b/xc/programs/x11perf/do_tests.c
index 894ec18b7..7ee4ba2f2 100644
--- a/xc/programs/x11perf/do_tests.c
+++ b/xc/programs/x11perf/do_tests.c
@@ -1,4 +1,4 @@
-/* $XConsortium: do_tests.c,v 2.32 94/02/28 21:57:25 dpw Exp $ */
+/* $XConsortium: do_tests.c,v 2.33 94/03/17 20:25:31 dpw Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_text.c b/xc/programs/x11perf/do_text.c
index c6d33a494..67dab4d9f 100644
--- a/xc/programs/x11perf/do_text.c
+++ b/xc/programs/x11perf/do_text.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_text.c,v 2.7 92/11/11 16:59:23 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_traps.c b/xc/programs/x11perf/do_traps.c
index 8b89af9ab..f85b4de7b 100644
--- a/xc/programs/x11perf/do_traps.c
+++ b/xc/programs/x11perf/do_traps.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_traps.c,v 2.6 94/02/06 20:17:41 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_tris.c b/xc/programs/x11perf/do_tris.c
index f60d63ac4..7f38cc510 100644
--- a/xc/programs/x11perf/do_tris.c
+++ b/xc/programs/x11perf/do_tris.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_tris.c,v 2.8 94/02/06 20:17:44 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_valgc.c b/xc/programs/x11perf/do_valgc.c
index 57e7729d8..7154f37b6 100644
--- a/xc/programs/x11perf/do_valgc.c
+++ b/xc/programs/x11perf/do_valgc.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_valgc.c,v 2.5 94/02/06 20:17:32 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/do_windows.c b/xc/programs/x11perf/do_windows.c
index 700ee8d02..b6f4f4eb1 100644
--- a/xc/programs/x11perf/do_windows.c
+++ b/xc/programs/x11perf/do_windows.c
@@ -1,4 +1,4 @@
-/* $XConsortium$ */
+/* $XConsortium: do_windows.c,v 2.7 94/02/06 20:17:37 rws Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/x11pcomp.cpp b/xc/programs/x11perf/x11pcomp.cpp
index ba584842f..3b37d3ddc 100644
--- a/xc/programs/x11perf/x11pcomp.cpp
+++ b/xc/programs/x11perf/x11pcomp.cpp
@@ -16,7 +16,7 @@ XCOMM
XCOMM Mark Moraes, University of Toronto <moraes@csri.toronto.edu>
XCOMM Joel McCormack, DEC Western Research Lab <joel@decwrl.dec.com>
XCOMM
-XCOMM $XConsortium$
+XCOMM $XConsortium: x11pcomp.cpp,v 1.6 91/08/22 11:43:57 rws Exp $
PATH=LIBPATH:.:$PATH
export PATH
diff --git a/xc/programs/x11perf/x11pcomp.man b/xc/programs/x11perf/x11pcomp.man
index 9de4a79a0..c2d5ed777 100644
--- a/xc/programs/x11perf/x11pcomp.man
+++ b/xc/programs/x11perf/x11pcomp.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: x11pcomp.man,v 1.5 94/04/12 18:44:12 dpw Exp $
+.\" $XConsortium: x11pcomp.man,v 1.6 94/04/17 20:38:38 dpw Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/x11perf/x11perf.c b/xc/programs/x11perf/x11perf.c
index ae6a264b6..f4c5b06b6 100644
--- a/xc/programs/x11perf/x11perf.c
+++ b/xc/programs/x11perf/x11perf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: x11perf.c,v 2.53 94/03/28 18:30:54 gildea Exp $ */
+/* $XConsortium: x11perf.c,v 2.54 94/03/30 19:40:27 gildea Exp $ */
/****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/x11perf.h b/xc/programs/x11perf/x11perf.h
index 1b58e9af6..007c150ac 100644
--- a/xc/programs/x11perf/x11perf.h
+++ b/xc/programs/x11perf/x11perf.h
@@ -1,4 +1,4 @@
-/* $XConsortium: x11perf.h,v 2.12 94/02/28 21:57:25 dpw Exp $ */
+/* $XConsortium: x11perf.h,v 2.13 94/03/17 20:25:53 dpw Exp $ */
/*****************************************************************************
Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/x11perf/x11perf.man b/xc/programs/x11perf/x11perf.man
index 214eca3e8..579d9b831 100644
--- a/xc/programs/x11perf/x11perf.man
+++ b/xc/programs/x11perf/x11perf.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: x11perf.man,v 1.23 94/04/12 19:01:57 dpw Exp $
+.\" $XConsortium: x11perf.man,v 1.24 94/04/17 20:38:40 dpw Exp $
.\" Copyright 1988, 1989 Digital Equipment Corporation.
.\" Copyright (c) 1989, 1994 X Consortium
.\"
diff --git a/xc/programs/xauth/Imakefile b/xc/programs/xauth/Imakefile
index dc0f05727..6437cf311 100644
--- a/xc/programs/xauth/Imakefile
+++ b/xc/programs/xauth/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.15 93/08/16 13:34:31 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.16 94/01/06 15:34:08 gildea Exp $
DEPLIBS = $(DEPXAUTHLIB) $(DEPXMULIB)
LOCAL_LIBRARIES = $(XAUTHLIB) $(XMULIB)
SRCS = xauth.c gethost.c process.c parsedpy.c
diff --git a/xc/programs/xauth/gethost.c b/xc/programs/xauth/gethost.c
index 089c4ab3d..77d39c141 100644
--- a/xc/programs/xauth/gethost.c
+++ b/xc/programs/xauth/gethost.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: gethost.c,v 1.21 94/04/17 20:37:51 hersh Exp kaleb $
+ * $XConsortium: gethost.c,v 1.22 94/11/30 16:29:52 kaleb Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xauth/parsedpy.c b/xc/programs/xauth/parsedpy.c
index 54207c44e..8285f956a 100644
--- a/xc/programs/xauth/parsedpy.c
+++ b/xc/programs/xauth/parsedpy.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: parsedpy.c,v 1.8 93/09/20 18:00:15 hersh Exp $
+ * $XConsortium: parsedpy.c,v 1.9 94/04/17 20:37:51 hersh Exp $
*
* parse_displayname - utility routine for splitting up display name strings
*
diff --git a/xc/programs/xauth/process.c b/xc/programs/xauth/process.c
index efc2255b6..4a3399586 100644
--- a/xc/programs/xauth/process.c
+++ b/xc/programs/xauth/process.c
@@ -1,4 +1,4 @@
-/* $XConsortium: process.c,v 1.48 94/04/17 20:37:52 gildea Exp gildea $ */
+/* $XConsortium: process.c,v 1.49 94/12/16 22:21:13 gildea Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xauth/xauth.c b/xc/programs/xauth/xauth.c
index a0ead15b9..88e69e394 100644
--- a/xc/programs/xauth/xauth.c
+++ b/xc/programs/xauth/xauth.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xauth.c,v 1.17 89/12/07 10:39:55 rws Exp $
+ * $XConsortium: xauth.c,v 1.18 94/04/17 20:37:53 rws Exp $
*
* xauth - manipulate authorization file
*
diff --git a/xc/programs/xauth/xauth.h b/xc/programs/xauth/xauth.h
index 1416f78b8..dd5c6ff30 100644
--- a/xc/programs/xauth/xauth.h
+++ b/xc/programs/xauth/xauth.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xauth.h,v 1.13 94/04/17 20:37:53 rws Exp kaleb $
+ * $XConsortium: xauth.h,v 1.14 94/11/16 21:51:31 kaleb Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xauth/xauth.man b/xc/programs/xauth/xauth.man
index 25185d2da..c3e568f2e 100644
--- a/xc/programs/xauth/xauth.man
+++ b/xc/programs/xauth/xauth.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xauth.man,v 1.11 94/04/12 18:00:03 gildea Exp $
+.\" $XConsortium: xauth.man,v 1.12 94/04/17 20:37:54 gildea Exp $
.\" Copyright (c) 1993 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xclipboard/Imakefile b/xc/programs/xclipboard/Imakefile
index 9149e5daf..c43414b8a 100644
--- a/xc/programs/xclipboard/Imakefile
+++ b/xc/programs/xclipboard/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.8 91/07/17 00:47:46 gildea Exp $
SRCS1 = xclipboard.c
OBJS1 = xclipboard.o
SRCS2 = xcutsel.c
diff --git a/xc/programs/xclipboard/XClipboard.ad b/xc/programs/xclipboard/XClipboard.ad
index 98d58d353..5ef644acc 100644
--- a/xc/programs/xclipboard/XClipboard.ad
+++ b/xc/programs/xclipboard/XClipboard.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: XClipboard.ad,v 1.13 94/02/09 19:43:59 gildea Exp $
*Command*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
*Label*Font: -*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1
*Text*Font: -*-courier-medium-r-normal--*-120-*-*-*-*-iso8859-1
diff --git a/xc/programs/xclipboard/xclipboard.c b/xc/programs/xclipboard/xclipboard.c
index bc599c58d..018e95b29 100644
--- a/xc/programs/xclipboard/xclipboard.c
+++ b/xc/programs/xclipboard/xclipboard.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xclipboard.c,v 1.27 93/09/20 17:59:01 hersh Exp $
+ * $XConsortium: xclipboard.c,v 1.28 94/04/17 20:25:08 hersh Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xclipboard/xclipboard.man b/xc/programs/xclipboard/xclipboard.man
index 40dd0ee33..8b66ab29b 100644
--- a/xc/programs/xclipboard/xclipboard.man
+++ b/xc/programs/xclipboard/xclipboard.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xclipboard.man,v 1.15 94/04/12 18:19:35 gildea Exp $
+.\" $XConsortium: xclipboard.man,v 1.16 94/04/17 20:25:11 gildea Exp $
.\" Copyright (c) 1988, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xclipboard/xcutsel.c b/xc/programs/xclipboard/xcutsel.c
index 6d6a0ccc2..f683e6351 100644
--- a/xc/programs/xclipboard/xcutsel.c
+++ b/xc/programs/xclipboard/xcutsel.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xcutsel.c,v 1.18 93/09/20 17:58:56 hersh Exp $
+ * $XConsortium: xcutsel.c,v 1.19 94/04/17 20:25:13 hersh Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xclipboard/xcutsel.man b/xc/programs/xclipboard/xcutsel.man
index fc9a62680..7ccfd95c9 100644
--- a/xc/programs/xclipboard/xcutsel.man
+++ b/xc/programs/xclipboard/xcutsel.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xcutsel.man,v 1.11 94/04/17 20:25:15 gildea Exp $
+.\" $XConsortium: xcutsel.man,v 1.12 94/04/18 18:31:04 rws Exp $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xclock/Clock.c b/xc/programs/xclock/Clock.c
index 845880c10..3d5706a7e 100644
--- a/xc/programs/xclock/Clock.c
+++ b/xc/programs/xclock/Clock.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Clock.c,v 1.73 94/04/17 20:23:50 rws Exp gildea $ */
+/* $XConsortium: Clock.c,v 1.74 95/06/08 23:20:39 gildea Exp $ */
/***********************************************************
diff --git a/xc/programs/xclock/Clock.h b/xc/programs/xclock/Clock.h
index 25e00d601..601910103 100644
--- a/xc/programs/xclock/Clock.h
+++ b/xc/programs/xclock/Clock.h
@@ -1,5 +1,5 @@
/*
-* $XConsortium: Clock.h,v 1.29 90/10/22 14:43:12 converse Exp $
+* $XConsortium: Clock.h,v 1.30 94/04/17 20:23:51 converse Exp $
*/
diff --git a/xc/programs/xclock/ClockP.h b/xc/programs/xclock/ClockP.h
index 86dbac8cb..598bf6049 100644
--- a/xc/programs/xclock/ClockP.h
+++ b/xc/programs/xclock/ClockP.h
@@ -1,5 +1,5 @@
/*
-* $XConsortium: ClockP.h,v 1.22 93/09/18 20:00:35 rws Exp $
+* $XConsortium: ClockP.h,v 1.23 94/04/17 20:23:53 rws Exp $
*/
diff --git a/xc/programs/xclock/Imakefile b/xc/programs/xclock/Imakefile
index 7b7126e98..9316e1f60 100644
--- a/xc/programs/xclock/Imakefile
+++ b/xc/programs/xclock/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.15 93/09/18 20:03:34 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.16 93/09/20 10:15:51 kaleb Exp $
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
SRCS = xclock.c Clock.c
diff --git a/xc/programs/xclock/xclock.c b/xc/programs/xclock/xclock.c
index 666d3fd5c..25e906457 100644
--- a/xc/programs/xclock/xclock.c
+++ b/xc/programs/xclock/xclock.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xclock.c,v 1.38 94/04/17 20:23:54 converse Exp converse $ */
+/* $XConsortium: xclock.c,v 1.39 95/03/10 21:35:13 converse Exp $ */
/*
* xclock -- Hacked from Tony Della Fera's much hacked clock program.
diff --git a/xc/programs/xclock/xclock.man b/xc/programs/xclock/xclock.man
index ceb6139ec..3531c7e6b 100644
--- a/xc/programs/xclock/xclock.man
+++ b/xc/programs/xclock/xclock.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xclock.man,v 1.24 94/04/12 18:35:34 gildea Exp $
+.\" $XConsortium: xclock.man,v 1.25 94/04/17 20:23:55 gildea Exp $
.\" Copyright (c) 1988, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xcmsdb/Imakefile b/xc/programs/xcmsdb/Imakefile
index 85d4a4bc3..8dee320f1 100644
--- a/xc/programs/xcmsdb/Imakefile
+++ b/xc/programs/xcmsdb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 91/07/23 00:50:48 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.7 93/08/19 09:32:11 rws Exp $
SRCS = xcmsdb.c loadData.c
OBJS = xcmsdb.o loadData.o
INCLUDES = -I$(XLIBSRC)
diff --git a/xc/programs/xcmsdb/SCCDFile.h b/xc/programs/xcmsdb/SCCDFile.h
index 1ed1e00da..0d70ea07f 100644
--- a/xc/programs/xcmsdb/SCCDFile.h
+++ b/xc/programs/xcmsdb/SCCDFile.h
@@ -1,4 +1,4 @@
-/* $XConsortium: SCCDFile.h,v 1.4 94/02/06 20:15:35 rws Exp $ */
+/* $XConsortium: SCCDFile.h,v 1.5 94/02/07 23:20:33 rws Exp $ */
/*
* (c) Copyright 1990 Tektronix Inc.
* All Rights Reserved
diff --git a/xc/programs/xcmsdb/loadData.c b/xc/programs/xcmsdb/loadData.c
index a0ac2736c..b7f7a43b6 100644
--- a/xc/programs/xcmsdb/loadData.c
+++ b/xc/programs/xcmsdb/loadData.c
@@ -1,4 +1,4 @@
-/* $XConsortium: loadData.c,v 1.11 94/02/07 23:21:38 rws Exp $ */
+/* $XConsortium: loadData.c,v 1.12 94/02/07 23:28:48 rws Exp $ */
/*
* (c) Copyright 1990 Tektronix Inc.
diff --git a/xc/programs/xcmsdb/xcmsdb.c b/xc/programs/xcmsdb/xcmsdb.c
index 6b5e07e13..de26d5750 100644
--- a/xc/programs/xcmsdb/xcmsdb.c
+++ b/xc/programs/xcmsdb/xcmsdb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xcmsdb.c,v 1.11 94/02/07 23:21:58 rws Exp $ */
+/* $XConsortium: xcmsdb.c,v 1.12 94/02/07 23:29:38 rws Exp $ */
/*
* (c) Copyright 1990 Tektronix Inc.
diff --git a/xc/programs/xcmsdb/xcmsdb.man b/xc/programs/xcmsdb/xcmsdb.man
index 5fa06de0c..5c8b76729 100644
--- a/xc/programs/xcmsdb/xcmsdb.man
+++ b/xc/programs/xcmsdb/xcmsdb.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xcmsdb.man,v 1.8 94/04/13 12:17:25 gildea Exp $
+.\" $XConsortium: xcmsdb.man,v 1.9 94/04/17 20:39:01 gildea Exp $
.\" Copyright 1990, Tektronix Inc.
.\" Copyright (c) 1993 X Consortium
.\"
diff --git a/xc/programs/xconsole/Imakefile b/xc/programs/xconsole/Imakefile
index 3193e67c7..ffb3cbf0f 100644
--- a/xc/programs/xconsole/Imakefile
+++ b/xc/programs/xconsole/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.3 91/07/16 23:07:10 gildea Exp $
SRCS = xconsole.c
OBJS = xconsole.o
PROGRAMS = xconsole
diff --git a/xc/programs/xconsole/XConsole.ad b/xc/programs/xconsole/XConsole.ad
index 529dc7b96..60855eff6 100644
--- a/xc/programs/xconsole/XConsole.ad
+++ b/xc/programs/xconsole/XConsole.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: XConsole.ad,v 1.3 94/02/09 19:44:01 gildea Exp $
*allowShellResize: true
XConsole.translations: #override\
<MapNotify>: Deiconified() \n\
diff --git a/xc/programs/xconsole/xconsole.c b/xc/programs/xconsole/xconsole.c
index 2ad3af23a..d6f2462d7 100644
--- a/xc/programs/xconsole/xconsole.c
+++ b/xc/programs/xconsole/xconsole.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xconsole.c,v 1.20 94/11/30 16:35:44 kaleb Exp kaleb $
+ * $XConsortium: xconsole.c,v 1.21 95/01/05 21:04:06 kaleb Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xconsole/xconsole.man b/xc/programs/xconsole/xconsole.man
index 155f25a13..0042ddc2f 100644
--- a/xc/programs/xconsole/xconsole.man
+++ b/xc/programs/xconsole/xconsole.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xconsole.man,v 1.7 94/04/12 18:41:28 gildea Exp $
+.\" $XConsortium: xconsole.man,v 1.8 94/04/17 20:39:49 gildea Exp $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/xc/programs/xdm/Imakefile b/xc/programs/xdm/Imakefile
index 5c3ea479a..606381349 100644
--- a/xc/programs/xdm/Imakefile
+++ b/xc/programs/xdm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.75 94/12/03 13:18:15 kaleb Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.76 95/01/05 20:57:42 kaleb Exp $
#define IHaveSubdirs
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
diff --git a/xc/programs/xdm/access.c b/xc/programs/xdm/access.c
index ea39a259c..6140368ea 100644
--- a/xc/programs/xdm/access.c
+++ b/xc/programs/xdm/access.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: access.c,v 1.14 93/09/20 18:03:26 hersh Exp $
+ * $XConsortium: access.c,v 1.15 94/04/17 20:03:32 hersh Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xdm/auth.c b/xc/programs/xdm/auth.c
index e14c0c117..088c08c63 100644
--- a/xc/programs/xdm/auth.c
+++ b/xc/programs/xdm/auth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: auth.c,v 1.58 94/11/21 18:33:11 kaleb Exp gildea $ */
+/* $XConsortium: auth.c,v 1.59 95/07/10 21:18:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/choose.c b/xc/programs/xdm/choose.c
index 494e7bb21..fc6aa428b 100644
--- a/xc/programs/xdm/choose.c
+++ b/xc/programs/xdm/choose.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: choose.c,v 1.15 94/04/17 20:03:34 rws Exp $
+ * $XConsortium: choose.c,v 1.16 94/06/03 16:34:38 mor Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xdm/chooser.c b/xc/programs/xdm/chooser.c
index 7331ea02a..6d5fe380f 100644
--- a/xc/programs/xdm/chooser.c
+++ b/xc/programs/xdm/chooser.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: chooser.c,v 1.21 94/11/21 18:33:11 kaleb Exp gildea $
+ * $XConsortium: chooser.c,v 1.22 95/06/08 23:20:39 gildea Exp $
*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xdm/config/GiveConsole b/xc/programs/xdm/config/GiveConsole
index 6d4c7dd8f..cbeb47291 100755
--- a/xc/programs/xdm/config/GiveConsole
+++ b/xc/programs/xdm/config/GiveConsole
@@ -1,6 +1,6 @@
#!/bin/sh
# Assign ownership of the console to the invoking user
-# $XConsortium$
+# $XConsortium: GiveConsole,v 1.2 93/09/28 14:29:20 gildea Exp $
#
# By convention, both xconsole and xterm -C check that the
# console is owned by the invoking user and is readable before attaching
diff --git a/xc/programs/xdm/config/Imakefile b/xc/programs/xdm/config/Imakefile
index 2b7edeb9d..e061317b3 100644
--- a/xc/programs/xdm/config/Imakefile
+++ b/xc/programs/xdm/config/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.15 93/08/25 09:30:19 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.16 94/02/10 16:56:04 rws Exp $
SERVERSTYPE = XdmServersType
diff --git a/xc/programs/xdm/config/README b/xc/programs/xdm/config/README
index 8bf461ec3..72b03df36 100644
--- a/xc/programs/xdm/config/README
+++ b/xc/programs/xdm/config/README
@@ -1,4 +1,4 @@
-$XConsortium$
+$XConsortium: README,v 1.3 93/09/28 14:30:28 gildea Exp $
Xdm Sample Configuration
diff --git a/xc/programs/xdm/config/TakeConsole b/xc/programs/xdm/config/TakeConsole
index 97ccdb466..942d3e5b3 100755
--- a/xc/programs/xdm/config/TakeConsole
+++ b/xc/programs/xdm/config/TakeConsole
@@ -1,7 +1,7 @@
#!/bin/sh
# Reassign ownership of the console to root, this should disallow
# assignment of console output to any random users's xterm
-# $XConsortium$
+# $XConsortium: TakeConsole,v 1.2 93/09/28 14:30:29 gildea Exp $
#
chmod 622 /dev/console
chown root /dev/console
diff --git a/xc/programs/xdm/config/Xaccess b/xc/programs/xdm/config/Xaccess
index de85e6a4d..8f2037970 100644
--- a/xc/programs/xdm/config/Xaccess
+++ b/xc/programs/xdm/config/Xaccess
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: Xaccess,v 1.5 91/08/26 11:52:51 rws Exp $
#
# Access control file for XDMCP connections
#
diff --git a/xc/programs/xdm/config/Xresources b/xc/programs/xdm/config/Xresources
index 64b4fd28d..e47ad93bb 100644
--- a/xc/programs/xdm/config/Xresources
+++ b/xc/programs/xdm/config/Xresources
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Xresources,v 1.7 93/09/28 14:30:29 gildea Exp $
xlogin*login.translations: #override\
Ctrl<Key>R: abort-display()\n\
<Key>F1: set-session-argument(failsafe) finish-field()\n\
diff --git a/xc/programs/xdm/config/Xserv.ws.cpp b/xc/programs/xdm/config/Xserv.ws.cpp
index f72156c41..5fbcc3425 100644
--- a/xc/programs/xdm/config/Xserv.ws.cpp
+++ b/xc/programs/xdm/config/Xserv.ws.cpp
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Xserv.ws.cpp,v 1.3 93/09/28 14:30:30 gildea Exp $
XCOMM
XCOMM Xservers file, workstation prototype
XCOMM
diff --git a/xc/programs/xdm/config/Xservers.fs b/xc/programs/xdm/config/Xservers.fs
index ad829c4de..f2e862174 100644
--- a/xc/programs/xdm/config/Xservers.fs
+++ b/xc/programs/xdm/config/Xservers.fs
@@ -1,4 +1,4 @@
-# $XConsortium$
+# $XConsortium: Xservers.fs,v 1.3 93/09/28 14:30:31 gildea Exp $
#
# Xservers file, fileserver prototype (any machine without a display)
#
diff --git a/xc/programs/xdm/config/Xsession b/xc/programs/xdm/config/Xsession
index dfca7a1d5..8478beb44 100755
--- a/xc/programs/xdm/config/Xsession
+++ b/xc/programs/xdm/config/Xsession
@@ -1,5 +1,5 @@
#!/bin/sh
-# $XConsortium: Xsession,v 1.8 92/08/20 16:56:51 gildea Exp $
+# $XConsortium: Xsession,v 1.9 92/08/29 16:24:57 gildea Exp $
# redirect errors to a file in user's home directory if we can
for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
diff --git a/xc/programs/xdm/config/Xsetup_0 b/xc/programs/xdm/config/Xsetup_0
index dda1f386a..e1ce8ec4c 100755
--- a/xc/programs/xdm/config/Xsetup_0
+++ b/xc/programs/xdm/config/Xsetup_0
@@ -1,3 +1,3 @@
#!/bin/sh
-# $XConsortium$
+# $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $
xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
diff --git a/xc/programs/xdm/config/xdm-conf.cpp b/xc/programs/xdm/config/xdm-conf.cpp
index a815be63d..b5066f046 100644
--- a/xc/programs/xdm/config/xdm-conf.cpp
+++ b/xc/programs/xdm/config/xdm-conf.cpp
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: xdm-conf.cpp,v 1.2 93/09/28 14:30:32 gildea Exp $
DisplayManager.errorLogFile: XDMDIR/xdm-errors
DisplayManager.pidFile: XDMDIR/xdm-pid
DisplayManager.keyFile: XDMDIR/xdm-keys
diff --git a/xc/programs/xdm/daemon.c b/xc/programs/xdm/daemon.c
index af5ffb8e0..2f7bc94e3 100644
--- a/xc/programs/xdm/daemon.c
+++ b/xc/programs/xdm/daemon.c
@@ -1,4 +1,4 @@
-/* $XConsortium: daemon.c,v 1.15 94/11/21 18:33:11 kaleb Exp kaleb $ */
+/* $XConsortium: daemon.c,v 1.16 94/12/01 17:10:49 kaleb Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/dm.c b/xc/programs/xdm/dm.c
index d68b0d502..8af65fbd4 100644
--- a/xc/programs/xdm/dm.c
+++ b/xc/programs/xdm/dm.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dm.c,v 1.70 94/04/17 20:03:36 gildea Exp gildea $ */
+/* $XConsortium: dm.c,v 1.71 95/07/10 21:18:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/dm.h b/xc/programs/xdm/dm.h
index e728089bf..f85d9ca51 100644
--- a/xc/programs/xdm/dm.h
+++ b/xc/programs/xdm/dm.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dm.h,v 1.65 94/12/12 15:35:36 kaleb Exp gildea $ */
+/* $XConsortium: dm.h,v 1.66 95/07/10 21:18:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/dpylist.c b/xc/programs/xdm/dpylist.c
index 7d179f85f..ff6f58cff 100644
--- a/xc/programs/xdm/dpylist.c
+++ b/xc/programs/xdm/dpylist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dpylist.c,v 1.28 94/02/10 19:04:51 gildea Exp $ */
+/* $XConsortium: dpylist.c,v 1.29 94/04/17 20:03:37 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/error.c b/xc/programs/xdm/error.c
index 49d41f25f..c8cec0907 100644
--- a/xc/programs/xdm/error.c
+++ b/xc/programs/xdm/error.c
@@ -1,4 +1,4 @@
-/* $XConsortium: error.c,v 1.15 94/02/02 15:03:02 gildea Exp $ */
+/* $XConsortium: error.c,v 1.16 94/04/17 20:03:38 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/file.c b/xc/programs/xdm/file.c
index 52bca97d3..bdc2ab76f 100644
--- a/xc/programs/xdm/file.c
+++ b/xc/programs/xdm/file.c
@@ -1,4 +1,4 @@
-/* $XConsortium: file.c,v 1.15 91/02/13 19:13:21 rws Exp $ */
+/* $XConsortium: file.c,v 1.16 94/04/17 20:03:38 rws Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/genauth.c b/xc/programs/xdm/genauth.c
index 2c7398a77..d74743973 100644
--- a/xc/programs/xdm/genauth.c
+++ b/xc/programs/xdm/genauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: genauth.c,v 1.22 94/11/21 19:58:57 kaleb Exp gildea $ */
+/* $XConsortium: genauth.c,v 1.23 95/07/10 21:18:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/greet.h b/xc/programs/xdm/greet.h
index 5f74f4d99..68d11a9e2 100644
--- a/xc/programs/xdm/greet.h
+++ b/xc/programs/xdm/greet.h
@@ -1,4 +1,4 @@
-/* $XConsortium: greet.h,v 1.3 94/04/17 20:03:39 gildea Exp converse $ */
+/* $XConsortium: greet.h,v 1.4 94/10/07 19:44:31 converse Exp $ */
/*
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/xdm/greeter/Imakefile b/xc/programs/xdm/greeter/Imakefile
index 535b0939f..e78d65c94 100644
--- a/xc/programs/xdm/greeter/Imakefile
+++ b/xc/programs/xdm/greeter/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 94/03/31 22:35:03 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.6 94/04/01 12:38:46 gildea Exp $
#define DoNormalLib NO
#define DoSharedLib YES
#define DoDebugLib NO
diff --git a/xc/programs/xdm/greeter/Login.c b/xc/programs/xdm/greeter/Login.c
index 420bda1bc..838dfae98 100644
--- a/xc/programs/xdm/greeter/Login.c
+++ b/xc/programs/xdm/greeter/Login.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Login.c,v 1.41 94/03/31 22:35:04 gildea Exp $ */
+/* $XConsortium: Login.c,v 1.42 94/04/17 20:03:53 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/greeter/Login.h b/xc/programs/xdm/greeter/Login.h
index 61424fbcb..f78873b72 100644
--- a/xc/programs/xdm/greeter/Login.h
+++ b/xc/programs/xdm/greeter/Login.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Login.h,v 1.8 89/07/25 17:58:57 keith Exp $ */
+/* $XConsortium: Login.h,v 1.9 94/04/17 20:03:53 keith Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/greeter/LoginP.h b/xc/programs/xdm/greeter/LoginP.h
index 04ba6d6da..c528eaf5a 100644
--- a/xc/programs/xdm/greeter/LoginP.h
+++ b/xc/programs/xdm/greeter/LoginP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: LoginP.h,v 1.6 89/07/21 13:43:57 jim Exp $ */
+/* $XConsortium: LoginP.h,v 1.7 94/04/17 20:03:54 jim Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/greeter/greet.c b/xc/programs/xdm/greeter/greet.c
index d5f4427f9..f2fdae005 100644
--- a/xc/programs/xdm/greeter/greet.c
+++ b/xc/programs/xdm/greeter/greet.c
@@ -1,4 +1,4 @@
-/* $XConsortium: greet.c,v 1.40 94/04/17 20:03:54 gildea Exp converse $ */
+/* $XConsortium: greet.c,v 1.41 94/09/12 21:32:49 converse Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/greeter/verify.c b/xc/programs/xdm/greeter/verify.c
index f4c59b1f4..53807b315 100644
--- a/xc/programs/xdm/greeter/verify.c
+++ b/xc/programs/xdm/greeter/verify.c
@@ -1,4 +1,4 @@
-/* $XConsortium: verify.c,v 1.34 94/10/07 19:41:36 converse Exp gildea $ */
+/* $XConsortium: verify.c,v 1.35 95/07/07 21:54:42 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/krb5auth.c b/xc/programs/xdm/krb5auth.c
index 53b4f9bf4..a97986ed4 100644
--- a/xc/programs/xdm/krb5auth.c
+++ b/xc/programs/xdm/krb5auth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: krb5auth.c,v 1.3 94/04/01 16:43:02 gildea Exp $ */
+/* $XConsortium: krb5auth.c,v 1.4 94/04/17 20:03:40 gildea Exp $ */
/*
Copyright (c) 1994 X Consortium
diff --git a/xc/programs/xdm/mitauth.c b/xc/programs/xdm/mitauth.c
index 056139e39..67aa735fa 100644
--- a/xc/programs/xdm/mitauth.c
+++ b/xc/programs/xdm/mitauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mitauth.c,v 1.11 94/01/09 18:07:19 gildea Exp $ */
+/* $XConsortium: mitauth.c,v 1.12 94/04/17 20:03:40 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/netaddr.c b/xc/programs/xdm/netaddr.c
index 215295457..c716704ed 100644
--- a/xc/programs/xdm/netaddr.c
+++ b/xc/programs/xdm/netaddr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: netaddr.c,v 1.7 94/03/31 22:24:56 rws Exp $ */
+/* $XConsortium: netaddr.c,v 1.8 94/04/17 20:03:41 rws Exp $ */
/*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/xdm/policy.c b/xc/programs/xdm/policy.c
index 65ae1b2bf..21e540fb1 100644
--- a/xc/programs/xdm/policy.c
+++ b/xc/programs/xdm/policy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: policy.c,v 1.11 93/09/20 18:03:14 hersh Exp $ */
+/* $XConsortium: policy.c,v 1.12 94/04/17 20:03:41 hersh Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/protodpy.c b/xc/programs/xdm/protodpy.c
index 5911a4a86..ce8d72808 100644
--- a/xc/programs/xdm/protodpy.c
+++ b/xc/programs/xdm/protodpy.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: protodpy.c,v 1.14 94/04/17 20:03:42 rws Exp gildea $
+ * $XConsortium: protodpy.c,v 1.15 95/07/10 21:18:07 gildea Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xdm/reset.c b/xc/programs/xdm/reset.c
index 9ceaa2623..ecdf43690 100644
--- a/xc/programs/xdm/reset.c
+++ b/xc/programs/xdm/reset.c
@@ -1,4 +1,4 @@
-/* $XConsortium: reset.c,v 1.10 91/09/19 16:26:03 keith Exp $ */
+/* $XConsortium: reset.c,v 1.11 94/04/17 20:03:42 keith Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/resource.c b/xc/programs/xdm/resource.c
index cd0488354..b11f9beb9 100644
--- a/xc/programs/xdm/resource.c
+++ b/xc/programs/xdm/resource.c
@@ -1,4 +1,4 @@
-/* $XConsortium: resource.c,v 1.46 94/02/02 08:42:21 gildea Exp $ */
+/* $XConsortium: resource.c,v 1.47 94/04/17 20:03:43 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/rpcauth.c b/xc/programs/xdm/rpcauth.c
index d4ac8b50e..ea7d56911 100644
--- a/xc/programs/xdm/rpcauth.c
+++ b/xc/programs/xdm/rpcauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: rpcauth.c,v 1.3 93/09/20 18:03:31 hersh Exp $ */
+/* $XConsortium: rpcauth.c,v 1.4 94/04/17 20:03:44 hersh Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/server.c b/xc/programs/xdm/server.c
index 895f28a86..06b7a047f 100644
--- a/xc/programs/xdm/server.c
+++ b/xc/programs/xdm/server.c
@@ -1,4 +1,4 @@
-/* $XConsortium: server.c,v 1.19 94/04/17 20:03:44 hersh Exp $ */
+/* $XConsortium: server.c,v 1.20 94/10/17 18:29:34 converse Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/session.c b/xc/programs/xdm/session.c
index 5d0078adb..526273ce5 100644
--- a/xc/programs/xdm/session.c
+++ b/xc/programs/xdm/session.c
@@ -1,4 +1,4 @@
-/* $XConsortium: session.c,v 1.74 94/10/17 18:26:13 converse Exp gildea $ */
+/* $XConsortium: session.c,v 1.75 95/06/08 23:20:39 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/sessreg.c b/xc/programs/xdm/sessreg.c
index c6c68cd92..edb8cc501 100644
--- a/xc/programs/xdm/sessreg.c
+++ b/xc/programs/xdm/sessreg.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: sessreg.c,v 1.16 95/01/25 16:02:40 kaleb Exp kaleb $
+ * $XConsortium: sessreg.c,v 1.17 95/01/29 12:07:22 kaleb Exp $
*
* Copyright (c) 1990 X Consortium
*
diff --git a/xc/programs/xdm/sessreg.man b/xc/programs/xdm/sessreg.man
index a64b251dd..19e228cbe 100644
--- a/xc/programs/xdm/sessreg.man
+++ b/xc/programs/xdm/sessreg.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: sessreg.man,v 1.12 94/04/17 20:03:46 matt Exp $
+.\" $XConsortium: sessreg.man,v 1.13 94/04/18 17:55:56 rws Exp $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xdm/socket.c b/xc/programs/xdm/socket.c
index af1212bb4..30716fc9f 100644
--- a/xc/programs/xdm/socket.c
+++ b/xc/programs/xdm/socket.c
@@ -1,4 +1,4 @@
-/* $XConsortium: socket.c,v 1.33 94/03/31 17:58:05 gildea Exp $ */
+/* $XConsortium: socket.c,v 1.34 94/04/17 20:03:47 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/streams.c b/xc/programs/xdm/streams.c
index abad6f97f..1de103354 100644
--- a/xc/programs/xdm/streams.c
+++ b/xc/programs/xdm/streams.c
@@ -1,4 +1,4 @@
-/* $XConsortium: streams.c,v 1.4 94/04/17 20:03:47 rws Exp $ */
+/* $XConsortium: streams.c,v 1.5 94/06/03 16:34:41 mor Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/util.c b/xc/programs/xdm/util.c
index 3a68a6e15..5d810650d 100644
--- a/xc/programs/xdm/util.c
+++ b/xc/programs/xdm/util.c
@@ -1,4 +1,4 @@
-/* $XConsortium: util.c,v 1.17 94/04/17 20:03:48 rws Exp kaleb $ */
+/* $XConsortium: util.c,v 1.18 94/11/21 18:33:11 kaleb Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xdm/xdm.man b/xc/programs/xdm/xdm.man
index 047e6e574..118752b8a 100644
--- a/xc/programs/xdm/xdm.man
+++ b/xc/programs/xdm/xdm.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xdm.man,v 1.39 95/05/04 00:03:58 gildea Exp gildea $
+.\" $XConsortium: xdm.man,v 1.40 95/07/10 21:18:07 gildea Exp $
.\" Copyright (c) 1988, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xdm/xdmauth.c b/xc/programs/xdm/xdmauth.c
index 44b4f4251..14f84e68b 100644
--- a/xc/programs/xdm/xdmauth.c
+++ b/xc/programs/xdm/xdmauth.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xdmauth.c,v 1.12 94/04/17 20:03:50 gildea Exp gildea $ */
+/* $XConsortium: xdmauth.c,v 1.13 95/07/10 21:18:07 gildea Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/xdmcp.c b/xc/programs/xdm/xdmcp.c
index 190468188..85a8ecbc2 100644
--- a/xc/programs/xdm/xdmcp.c
+++ b/xc/programs/xdm/xdmcp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xdmcp.c,v 1.14 94/04/17 20:03:50 gildea Exp converse $ */
+/* $XConsortium: xdmcp.c,v 1.15 94/09/19 20:16:38 converse Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xdm/xdmshell.c b/xc/programs/xdm/xdmshell.c
index fba797f15..710fe904b 100644
--- a/xc/programs/xdm/xdmshell.c
+++ b/xc/programs/xdm/xdmshell.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xdmshell.c,v 1.15 94/11/28 23:32:58 gildea Exp kaleb $ */
+/* $XConsortium: xdmshell.c,v 1.16 95/01/05 20:57:57 kaleb Exp $ */
/*
* xdmshell - simple program for running xdm from login
*
diff --git a/xc/programs/xdpyinfo/Imakefile b/xc/programs/xdpyinfo/Imakefile
index 5d9e2a7ed..d7859092d 100644
--- a/xc/programs/xdpyinfo/Imakefile
+++ b/xc/programs/xdpyinfo/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 91/07/17 16:07:10 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.6 94/07/12 18:15:34 dpw Exp $
DEPLIBS = $(DEPXTESTLIB) $(DEPXIELIB) $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XTESTLIB) $(XIELIB) $(XMULIB) $(XLIB)
SYS_LIBRARIES = MathLibrary
diff --git a/xc/programs/xdpyinfo/xdpyinfo.c b/xc/programs/xdpyinfo/xdpyinfo.c
index cef61da50..417df43c3 100644
--- a/xc/programs/xdpyinfo/xdpyinfo.c
+++ b/xc/programs/xdpyinfo/xdpyinfo.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xdpyinfo.c,v 1.32 94/09/24 20:15:12 rws Exp dpw $
+ * $XConsortium: xdpyinfo.c,v 1.33 95/06/08 12:56:34 dpw Exp $
*
* xdpyinfo - print information about X display connecton
*
diff --git a/xc/programs/xdpyinfo/xdpyinfo.man b/xc/programs/xdpyinfo/xdpyinfo.man
index 6d27df222..44e5473a0 100644
--- a/xc/programs/xdpyinfo/xdpyinfo.man
+++ b/xc/programs/xdpyinfo/xdpyinfo.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xdpyinfo.man,v 1.17 94/06/06 11:45:00 rws Exp $
+.\" $XConsortium: xdpyinfo.man,v 1.18 94/07/15 14:49:25 dpw Exp $
.\" Copyright (c) 1988, 1989, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xfd/Imakefile b/xc/programs/xfd/Imakefile
index c628ba2ee..64a75d9c2 100644
--- a/xc/programs/xfd/Imakefile
+++ b/xc/programs/xfd/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.8 91/07/17 00:46:49 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.9 93/09/04 19:54:12 rws Exp $
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
SRCS = xfd.c grid.c
diff --git a/xc/programs/xfd/Xfd.ad b/xc/programs/xfd/Xfd.ad
index 554e37d6e..df9485927 100644
--- a/xc/programs/xfd/Xfd.ad
+++ b/xc/programs/xfd/Xfd.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Xfd.ad,v 1.9 94/02/09 19:44:03 gildea Exp $
*internalBorderWidth: 0
*showGrip: false
diff --git a/xc/programs/xfd/grid.c b/xc/programs/xfd/grid.c
index 5f35876be..caa3afa04 100644
--- a/xc/programs/xfd/grid.c
+++ b/xc/programs/xfd/grid.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: grid.c,v 1.28 93/09/04 19:52:28 rws Exp $
+ * $XConsortium: grid.c,v 1.29 94/04/17 20:24:13 rws Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xfd/grid.h b/xc/programs/xfd/grid.h
index 4d0304715..ce52737ff 100644
--- a/xc/programs/xfd/grid.h
+++ b/xc/programs/xfd/grid.h
@@ -1,4 +1,4 @@
-/* $XConsortium: grid.h,v 1.10 94/04/13 17:40:56 gildea Exp $ */
+/* $XConsortium: grid.h,v 1.11 94/04/17 20:24:14 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xfd/gridP.h b/xc/programs/xfd/gridP.h
index e5a2047a0..5fef3135d 100644
--- a/xc/programs/xfd/gridP.h
+++ b/xc/programs/xfd/gridP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: gridP.h,v 1.12 94/04/13 17:36:04 gildea Exp $ */
+/* $XConsortium: gridP.h,v 1.13 94/04/17 20:24:14 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xfd/xfd.c b/xc/programs/xfd/xfd.c
index c514e9b26..b5b320fa0 100644
--- a/xc/programs/xfd/xfd.c
+++ b/xc/programs/xfd/xfd.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xfd.c,v 1.32 93/09/04 19:51:41 rws Exp $
+ * $XConsortium: xfd.c,v 1.33 94/04/17 20:24:15 rws Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xfd/xfd.man b/xc/programs/xfd/xfd.man
index fde784681..c3f996668 100644
--- a/xc/programs/xfd/xfd.man
+++ b/xc/programs/xfd/xfd.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xfd.man,v 1.25 94/04/15 13:25:14 dpw Exp $
+.\" $XConsortium: xfd.man,v 1.26 94/04/17 19:02:22 rws Exp $
.\" Copyright (c) 1989, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xfs/Imakefile b/xc/programs/xfs/Imakefile
index 156a515f2..a6d6f9d9b 100644
--- a/xc/programs/xfs/Imakefile
+++ b/xc/programs/xfs/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.25 93/12/13 17:36:44 dpw Exp $
+XCOMM $XConsortium: Imakefile,v 1.26 94/02/10 21:47:08 rws Exp $
#undef ServerDefines
#include <Server.tmpl>
#define IHaveSubdirs
diff --git a/xc/programs/xfs/config.cpp b/xc/programs/xfs/config.cpp
index b303fae90..d71717672 100644
--- a/xc/programs/xfs/config.cpp
+++ b/xc/programs/xfs/config.cpp
@@ -1,5 +1,5 @@
XCOMM font server configuration file
-XCOMM $XConsortium$
+XCOMM $XConsortium: config.cpp,v 1.7 91/08/22 11:39:59 rws Exp $
clone-self = on
use-syslog = off
diff --git a/xc/programs/xfs/difs/Imakefile b/xc/programs/xfs/difs/Imakefile
index 63adee2e7..1d49513ea 100644
--- a/xc/programs/xfs/difs/Imakefile
+++ b/xc/programs/xfs/difs/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.13 93/09/04 19:18:23 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.14 94/02/09 17:20:10 gildea Exp $
#undef ServerDefines
#include <Server.tmpl>
diff --git a/xc/programs/xfs/difs/atom.c b/xc/programs/xfs/difs/atom.c
index 59a883953..c49f2b4d2 100644
--- a/xc/programs/xfs/difs/atom.c
+++ b/xc/programs/xfs/difs/atom.c
@@ -1,4 +1,4 @@
-/* $XConsortium: atom.c,v 1.5 94/04/12 22:00:42 dpw Exp $ */
+/* $XConsortium: atom.c,v 1.6 94/04/17 19:56:10 dpw Exp $ */
/*
* font server atom manipulations
*/
diff --git a/xc/programs/xfs/difs/cache.c b/xc/programs/xfs/difs/cache.c
index c626606d2..d949fc42b 100644
--- a/xc/programs/xfs/difs/cache.c
+++ b/xc/programs/xfs/difs/cache.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cache.c,v 1.6 94/04/12 22:00:45 dpw Exp $ */
+/* $XConsortium: cache.c,v 1.7 94/04/17 19:56:11 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/difs/charinfo.c b/xc/programs/xfs/difs/charinfo.c
index 064337525..d5188a384 100644
--- a/xc/programs/xfs/difs/charinfo.c
+++ b/xc/programs/xfs/difs/charinfo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: charinfo.c,v 1.14 94/03/28 14:12:16 gildea Exp $ */
+/* $XConsortium: charinfo.c,v 1.15 94/04/17 19:56:12 gildea Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/xfs/difs/difsutils.c b/xc/programs/xfs/difs/difsutils.c
index e7dc6c932..9a244ce13 100644
--- a/xc/programs/xfs/difs/difsutils.c
+++ b/xc/programs/xfs/difs/difsutils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: difsutils.c,v 1.11 94/03/17 18:11:48 gildea Exp $ */
+/* $XConsortium: difsutils.c,v 1.12 94/04/17 19:56:12 gildea Exp $ */
/*
* misc utility routines
*/
diff --git a/xc/programs/xfs/difs/dispatch.c b/xc/programs/xfs/difs/dispatch.c
index 2695f0575..1e79967d5 100644
--- a/xc/programs/xfs/difs/dispatch.c
+++ b/xc/programs/xfs/difs/dispatch.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dispatch.c,v 1.23 94/02/09 21:33:06 gildea Exp $ */
+/* $XConsortium: dispatch.c,v 1.24 94/04/17 19:56:13 gildea Exp $ */
/*
* protocol dispatcher
*/
diff --git a/xc/programs/xfs/difs/events.c b/xc/programs/xfs/difs/events.c
index 29eda7b0b..96761095a 100644
--- a/xc/programs/xfs/difs/events.c
+++ b/xc/programs/xfs/difs/events.c
@@ -1,4 +1,4 @@
-/* $XConsortium: events.c,v 1.4 92/11/18 21:30:09 gildea Exp $ */
+/* $XConsortium: events.c,v 1.5 94/04/17 19:56:14 gildea Exp $ */
/*
* event handling stuff
*/
diff --git a/xc/programs/xfs/difs/extensions.c b/xc/programs/xfs/difs/extensions.c
index aed1f07b9..17282b5bb 100644
--- a/xc/programs/xfs/difs/extensions.c
+++ b/xc/programs/xfs/difs/extensions.c
@@ -1,4 +1,4 @@
-/* $XConsortium: extensions.c,v 1.6 93/09/20 18:10:45 hersh Exp $ */
+/* $XConsortium: extensions.c,v 1.7 94/04/17 19:56:14 hersh Exp $ */
/*
* font server extensions
*/
diff --git a/xc/programs/xfs/difs/fontinfo.c b/xc/programs/xfs/difs/fontinfo.c
index 2a05f826d..a5d64b26d 100644
--- a/xc/programs/xfs/difs/fontinfo.c
+++ b/xc/programs/xfs/difs/fontinfo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: fontinfo.c,v 1.12 93/09/23 14:45:25 gildea Exp $ */
+/* $XConsortium: fontinfo.c,v 1.13 94/04/17 19:56:15 gildea Exp $ */
/*
* font data query
*/
diff --git a/xc/programs/xfs/difs/fonts.c b/xc/programs/xfs/difs/fonts.c
index c7c7f8aaf..65a20e1ae 100644
--- a/xc/programs/xfs/difs/fonts.c
+++ b/xc/programs/xfs/difs/fonts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: fonts.c,v 1.25 94/04/17 19:56:15 gildea Exp $ */
+/* $XConsortium: fonts.c,v 1.27 95/05/19 19:14:19 dpw Exp $ */
/*
* font control
*/
diff --git a/xc/programs/xfs/difs/globals.c b/xc/programs/xfs/difs/globals.c
index 519f6ed8b..7220e7390 100644
--- a/xc/programs/xfs/difs/globals.c
+++ b/xc/programs/xfs/difs/globals.c
@@ -1,4 +1,4 @@
-/* $XConsortium: globals.c,v 1.4 94/04/12 22:00:48 dpw Exp $ */
+/* $XConsortium: globals.c,v 1.5 94/04/17 19:56:17 dpw Exp $ */
/*
* various font server globals
*/
diff --git a/xc/programs/xfs/difs/initfonts.c b/xc/programs/xfs/difs/initfonts.c
index 5fd29f80a..42e149ecc 100644
--- a/xc/programs/xfs/difs/initfonts.c
+++ b/xc/programs/xfs/difs/initfonts.c
@@ -1,4 +1,4 @@
-/* $XConsortium: initfonts.c,v 1.6 94/04/12 22:00:50 dpw Exp $ */
+/* $XConsortium: initfonts.c,v 1.7 94/04/17 19:56:17 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/difs/main.c b/xc/programs/xfs/difs/main.c
index 3d3ca2596..e3f650ec7 100644
--- a/xc/programs/xfs/difs/main.c
+++ b/xc/programs/xfs/difs/main.c
@@ -1,4 +1,4 @@
-/* $XConsortium: main.c,v 1.14 94/03/02 12:17:23 mor Exp $ */
+/* $XConsortium: main.c,v 1.15 94/04/17 19:56:18 mor Exp $ */
/*
* Font server main routine
*/
diff --git a/xc/programs/xfs/difs/resource.c b/xc/programs/xfs/difs/resource.c
index 9ad4dd6e0..768bedc7a 100644
--- a/xc/programs/xfs/difs/resource.c
+++ b/xc/programs/xfs/difs/resource.c
@@ -1,4 +1,4 @@
-/* $XConsortium: resource.c,v 1.7 94/04/12 22:00:51 dpw Exp $ */
+/* $XConsortium: resource.c,v 1.8 94/04/17 19:56:18 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/difs/swaprep.c b/xc/programs/xfs/difs/swaprep.c
index 1830d75b5..3a119db3b 100644
--- a/xc/programs/xfs/difs/swaprep.c
+++ b/xc/programs/xfs/difs/swaprep.c
@@ -1,4 +1,4 @@
-/* $XConsortium: swaprep.c,v 1.10 94/02/09 20:57:20 gildea Exp $ */
+/* $XConsortium: swaprep.c,v 1.11 94/04/17 19:56:19 gildea Exp $ */
/*
* font server reply swapping
*/
diff --git a/xc/programs/xfs/difs/swapreq.c b/xc/programs/xfs/difs/swapreq.c
index 805653c73..101649d64 100644
--- a/xc/programs/xfs/difs/swapreq.c
+++ b/xc/programs/xfs/difs/swapreq.c
@@ -1,4 +1,4 @@
-/* $XConsortium: swapreq.c,v 1.6 92/11/18 21:30:11 gildea Exp $ */
+/* $XConsortium: swapreq.c,v 1.7 94/04/17 19:56:19 gildea Exp $ */
/*
* swapped requests
*/
diff --git a/xc/programs/xfs/difs/tables.c b/xc/programs/xfs/difs/tables.c
index 6dd036261..7b04a59af 100644
--- a/xc/programs/xfs/difs/tables.c
+++ b/xc/programs/xfs/difs/tables.c
@@ -1,4 +1,4 @@
-/* $XConsortium: tables.c,v 1.5 92/05/28 16:43:08 gildea Exp $ */
+/* $XConsortium: tables.c,v 1.6 94/04/17 19:56:20 gildea Exp $ */
/*
* all the dispatch, error, event and reply vectors
*/
diff --git a/xc/programs/xfs/include/access.h b/xc/programs/xfs/include/access.h
index 239e2e535..4edab9061 100644
--- a/xc/programs/xfs/include/access.h
+++ b/xc/programs/xfs/include/access.h
@@ -1,4 +1,4 @@
-/* $XConsortium: access.h,v 1.3 94/04/12 21:59:06 dpw Exp $ */
+/* $XConsortium: access.h,v 1.4 94/04/17 19:55:51 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/accstr.h b/xc/programs/xfs/include/accstr.h
index 932e66777..b862bdfaa 100644
--- a/xc/programs/xfs/include/accstr.h
+++ b/xc/programs/xfs/include/accstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: accstr.h,v 1.3 94/04/12 21:59:10 dpw Exp $ */
+/* $XConsortium: accstr.h,v 1.4 94/04/17 19:55:51 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/assert.h b/xc/programs/xfs/include/assert.h
index f683ad45c..1d29405e7 100644
--- a/xc/programs/xfs/include/assert.h
+++ b/xc/programs/xfs/include/assert.h
@@ -1,4 +1,4 @@
-/* $XConsortium: assert.h,v 1.3 94/04/12 21:59:12 dpw Exp $ */
+/* $XConsortium: assert.h,v 1.4 94/04/17 19:55:52 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/auth.h b/xc/programs/xfs/include/auth.h
index 94a6be379..a7b76ad81 100644
--- a/xc/programs/xfs/include/auth.h
+++ b/xc/programs/xfs/include/auth.h
@@ -1,4 +1,4 @@
-/* $XConsortium: auth.h,v 1.3 94/04/12 21:59:13 dpw Exp $ */
+/* $XConsortium: auth.h,v 1.4 94/04/17 19:55:52 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/authstr.h b/xc/programs/xfs/include/authstr.h
index a12fea805..e69064127 100644
--- a/xc/programs/xfs/include/authstr.h
+++ b/xc/programs/xfs/include/authstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: authstr.h,v 1.4 94/04/12 21:59:15 dpw Exp $ */
+/* $XConsortium: authstr.h,v 1.5 94/04/17 19:55:53 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/cache.h b/xc/programs/xfs/include/cache.h
index 5fafb6e9d..577c4ced9 100644
--- a/xc/programs/xfs/include/cache.h
+++ b/xc/programs/xfs/include/cache.h
@@ -1,4 +1,4 @@
-/* $XConsortium: cache.h,v 1.4 94/04/12 21:59:16 dpw Exp $ */
+/* $XConsortium: cache.h,v 1.5 94/04/17 19:55:53 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/cachestr.h b/xc/programs/xfs/include/cachestr.h
index 52bdba86d..85c3c4675 100644
--- a/xc/programs/xfs/include/cachestr.h
+++ b/xc/programs/xfs/include/cachestr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: cachestr.h,v 1.3 94/04/12 21:59:17 dpw Exp $ */
+/* $XConsortium: cachestr.h,v 1.4 94/04/17 19:55:54 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/client.h b/xc/programs/xfs/include/client.h
index e08792c9c..9ab9c27ab 100644
--- a/xc/programs/xfs/include/client.h
+++ b/xc/programs/xfs/include/client.h
@@ -1,4 +1,4 @@
-/* $XConsortium: client.h,v 1.4 92/11/18 21:00:40 gildea Exp $ */
+/* $XConsortium: client.h,v 1.5 94/04/17 19:55:54 gildea Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/xfs/include/clientstr.h b/xc/programs/xfs/include/clientstr.h
index 4ecc1a526..797949d9e 100644
--- a/xc/programs/xfs/include/clientstr.h
+++ b/xc/programs/xfs/include/clientstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: clientstr.h,v 1.6 94/04/12 21:59:18 dpw Exp $ */
+/* $XConsortium: clientstr.h,v 1.7 94/04/17 19:55:55 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/closestr.h b/xc/programs/xfs/include/closestr.h
index c22527570..cfdc0d0e9 100644
--- a/xc/programs/xfs/include/closestr.h
+++ b/xc/programs/xfs/include/closestr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: closestr.h,v 1.6 94/04/17 19:55:55 dpw Exp $ */
+/* $XConsortium: closestr.h,v 1.7 95/05/19 19:17:19 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/closure.h b/xc/programs/xfs/include/closure.h
index c65e8b5a4..4e2c6c6d0 100644
--- a/xc/programs/xfs/include/closure.h
+++ b/xc/programs/xfs/include/closure.h
@@ -1,4 +1,4 @@
-/* $XConsortium: closure.h,v 1.3 94/04/12 21:59:21 dpw Exp $ */
+/* $XConsortium: closure.h,v 1.4 94/04/17 19:55:55 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/difsfn.h b/xc/programs/xfs/include/difsfn.h
index 0d4d152cc..8a67c61cf 100644
--- a/xc/programs/xfs/include/difsfn.h
+++ b/xc/programs/xfs/include/difsfn.h
@@ -1,4 +1,4 @@
-/* $XConsortium: difsfn.h,v 1.5 94/04/12 21:59:22 dpw Exp $ */
+/* $XConsortium: difsfn.h,v 1.6 94/04/17 19:55:56 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/difsfnst.h b/xc/programs/xfs/include/difsfnst.h
index 7db24ccbc..3fc7ea7f3 100644
--- a/xc/programs/xfs/include/difsfnst.h
+++ b/xc/programs/xfs/include/difsfnst.h
@@ -1,4 +1,4 @@
-/* $XConsortium: difsfnst.h,v 1.5 94/04/12 21:59:23 dpw Exp $ */
+/* $XConsortium: difsfnst.h,v 1.6 94/04/17 19:55:57 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/events.h b/xc/programs/xfs/include/events.h
index 986206a89..6aab1b3dc 100644
--- a/xc/programs/xfs/include/events.h
+++ b/xc/programs/xfs/include/events.h
@@ -1,4 +1,4 @@
-/* $XConsortium: events.h,v 1.4 94/04/12 21:59:25 dpw Exp $ */
+/* $XConsortium: events.h,v 1.5 94/04/17 19:55:57 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/extentst.h b/xc/programs/xfs/include/extentst.h
index 1acf52b9d..dd4621c53 100644
--- a/xc/programs/xfs/include/extentst.h
+++ b/xc/programs/xfs/include/extentst.h
@@ -1,4 +1,4 @@
-/* $XConsortium: extentst.h,v 1.3 94/04/12 21:59:27 dpw Exp $ */
+/* $XConsortium: extentst.h,v 1.4 94/04/17 19:55:58 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/globals.h b/xc/programs/xfs/include/globals.h
index 4085e7c90..f67834e44 100644
--- a/xc/programs/xfs/include/globals.h
+++ b/xc/programs/xfs/include/globals.h
@@ -1,4 +1,4 @@
-/* $XConsortium: globals.h,v 1.4 94/04/12 21:59:28 dpw Exp $ */
+/* $XConsortium: globals.h,v 1.5 94/04/17 19:55:58 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/misc.h b/xc/programs/xfs/include/misc.h
index 6a1d8648c..f0dcb5503 100644
--- a/xc/programs/xfs/include/misc.h
+++ b/xc/programs/xfs/include/misc.h
@@ -1,4 +1,4 @@
-/* $XConsortium: misc.h,v 1.8 94/04/17 19:55:59 mor Exp gildea $ */
+/* $XConsortium: misc.h,v 1.9 95/06/08 23:20:39 gildea Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/xfs/include/os.h b/xc/programs/xfs/include/os.h
index 9da734b38..e1a0532fd 100644
--- a/xc/programs/xfs/include/os.h
+++ b/xc/programs/xfs/include/os.h
@@ -1,4 +1,4 @@
-/* $XConsortium: os.h,v 1.9 94/09/16 19:00:32 kaleb Exp kaleb $ */
+/* $XConsortium: os.h,v 1.10 95/04/07 20:34:17 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/osstruct.h b/xc/programs/xfs/include/osstruct.h
index ddbad6633..80325530e 100644
--- a/xc/programs/xfs/include/osstruct.h
+++ b/xc/programs/xfs/include/osstruct.h
@@ -1,4 +1,4 @@
-/* $XConsortium: osstruct.h,v 1.3 94/04/12 21:59:30 dpw Exp $ */
+/* $XConsortium: osstruct.h,v 1.4 94/04/17 19:56:00 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/resource.h b/xc/programs/xfs/include/resource.h
index f012e47a7..6e2aa290e 100644
--- a/xc/programs/xfs/include/resource.h
+++ b/xc/programs/xfs/include/resource.h
@@ -1,4 +1,4 @@
-/* $XConsortium: resource.h,v 1.3 94/04/12 21:59:32 dpw Exp $ */
+/* $XConsortium: resource.h,v 1.4 94/04/17 19:56:00 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/servermd.h b/xc/programs/xfs/include/servermd.h
index b1b612890..f031bbc72 100644
--- a/xc/programs/xfs/include/servermd.h
+++ b/xc/programs/xfs/include/servermd.h
@@ -1,4 +1,4 @@
-/* $XConsortium: servermd.h,v 1.8 94/04/12 21:59:33 dpw Exp $ */
+/* $XConsortium: servermd.h,v 1.9 94/04/17 19:56:01 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/include/site.h b/xc/programs/xfs/include/site.h
index 014042398..107ad1c8e 100644
--- a/xc/programs/xfs/include/site.h
+++ b/xc/programs/xfs/include/site.h
@@ -1,4 +1,4 @@
-/* $XConsortium: site.h,v 1.5 94/04/12 21:59:34 dpw Exp $ */
+/* $XConsortium: site.h,v 1.6 94/04/17 19:56:01 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/os/Imakefile b/xc/programs/xfs/os/Imakefile
index 60f3f271d..9b4833c68 100644
--- a/xc/programs/xfs/os/Imakefile
+++ b/xc/programs/xfs/os/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.15 94/03/31 17:49:40 mor Exp kaleb $
+XCOMM $XConsortium: Imakefile,v 1.16 95/04/07 19:42:56 kaleb Exp $
#undef ServerDefines
#include <Server.tmpl>
diff --git a/xc/programs/xfs/os/access.c b/xc/programs/xfs/os/access.c
index 51ded29c3..15ce5ed2a 100644
--- a/xc/programs/xfs/os/access.c
+++ b/xc/programs/xfs/os/access.c
@@ -1,4 +1,4 @@
-/* $XConsortium: access.c,v 1.10 93/12/06 15:20:38 kaleb Exp $ */
+/* $XConsortium: access.c,v 1.11 94/04/17 19:56:02 kaleb Exp $ */
/*
Copyright (c) 1990, 1991 X Consortium
diff --git a/xc/programs/xfs/os/config.c b/xc/programs/xfs/os/config.c
index 8a2d5db02..b505fe28a 100644
--- a/xc/programs/xfs/os/config.c
+++ b/xc/programs/xfs/os/config.c
@@ -1,4 +1,4 @@
-/* $XConsortium: config.c,v 1.14 94/04/12 22:00:16 dpw Exp $ */
+/* $XConsortium: config.c,v 1.15 94/04/17 19:56:03 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/os/config.h b/xc/programs/xfs/os/config.h
index 3d27586f3..526396269 100644
--- a/xc/programs/xfs/os/config.h
+++ b/xc/programs/xfs/os/config.h
@@ -1,4 +1,4 @@
-/* $XConsortium: config.h,v 1.3 94/04/12 22:00:21 dpw Exp $ */
+/* $XConsortium: config.h,v 1.4 94/04/17 19:56:03 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/os/configstr.h b/xc/programs/xfs/os/configstr.h
index 6381ec416..52a6d8377 100644
--- a/xc/programs/xfs/os/configstr.h
+++ b/xc/programs/xfs/os/configstr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: configstr.h,v 1.3 94/04/12 22:00:23 dpw Exp $ */
+/* $XConsortium: configstr.h,v 1.4 94/04/17 19:56:04 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/os/connection.c b/xc/programs/xfs/os/connection.c
index 66304c6c5..f5ea3513a 100644
--- a/xc/programs/xfs/os/connection.c
+++ b/xc/programs/xfs/os/connection.c
@@ -1,4 +1,4 @@
-/* $XConsortium: connection.c,v 1.31 95/03/04 12:43:22 kaleb Exp kaleb $ */
+/* $XConsortium: connection.c,v 1.32 95/04/05 19:58:18 kaleb Exp $ */
/*
* handles connections
*/
diff --git a/xc/programs/xfs/os/error.c b/xc/programs/xfs/os/error.c
index 09e15cc5e..adbf9ed8c 100644
--- a/xc/programs/xfs/os/error.c
+++ b/xc/programs/xfs/os/error.c
@@ -1,4 +1,4 @@
-/* $XConsortium: error.c,v 1.8 94/02/09 16:48:01 gildea Exp $ */
+/* $XConsortium: error.c,v 1.9 94/04/17 19:56:05 gildea Exp $ */
/*
* error message handling
*/
diff --git a/xc/programs/xfs/os/io.c b/xc/programs/xfs/os/io.c
index 395b3e479..a954b1eaa 100644
--- a/xc/programs/xfs/os/io.c
+++ b/xc/programs/xfs/os/io.c
@@ -1,4 +1,4 @@
-/* $XConsortium: io.c,v 1.16 94/04/17 19:56:06 mor Exp kaleb $ */
+/* $XConsortium: io.c,v 1.17 95/04/05 19:58:20 kaleb Exp $ */
/*
* i/o functions
*/
diff --git a/xc/programs/xfs/os/osdep.h b/xc/programs/xfs/os/osdep.h
index 56e6ffa71..e614caecd 100644
--- a/xc/programs/xfs/os/osdep.h
+++ b/xc/programs/xfs/os/osdep.h
@@ -1,4 +1,4 @@
-/* $XConsortium: osdep.h,v 1.8 94/04/12 22:00:24 dpw Exp $ */
+/* $XConsortium: osdep.h,v 1.9 94/04/17 19:56:07 dpw Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/os/osglue.c b/xc/programs/xfs/os/osglue.c
index 393dc2664..dd3aedfca 100644
--- a/xc/programs/xfs/os/osglue.c
+++ b/xc/programs/xfs/os/osglue.c
@@ -1,4 +1,4 @@
-/* $XConsortium: osglue.c,v 1.11 95/03/02 20:13:00 kaleb Exp kaleb $ */
+/* $XConsortium: osglue.c,v 1.12 95/04/07 19:42:57 kaleb Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xfs/os/osinit.c b/xc/programs/xfs/os/osinit.c
index a4ba1dad6..3e1ad34a7 100644
--- a/xc/programs/xfs/os/osinit.c
+++ b/xc/programs/xfs/os/osinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: osinit.c,v 1.5 94/04/12 22:00:27 dpw Exp $ */
+/* $XConsortium: osinit.c,v 1.6 94/04/17 19:56:08 dpw Exp $ */
/*
* os init code
*/
diff --git a/xc/programs/xfs/os/utils.c b/xc/programs/xfs/os/utils.c
index 30546b5b5..82a198ac6 100644
--- a/xc/programs/xfs/os/utils.c
+++ b/xc/programs/xfs/os/utils.c
@@ -1,4 +1,4 @@
-/* $XConsortium: utils.c,v 1.19 94/03/28 18:31:46 gildea Exp $ */
+/* $XConsortium: utils.c,v 1.20 94/04/17 19:56:08 gildea Exp $ */
/*
* misc os utilities
*/
diff --git a/xc/programs/xfs/os/waitfor.c b/xc/programs/xfs/os/waitfor.c
index 57d180ea1..7fa129f08 100644
--- a/xc/programs/xfs/os/waitfor.c
+++ b/xc/programs/xfs/os/waitfor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: waitfor.c,v 1.13 94/04/17 19:56:09 dpw Exp kaleb $ */
+/* $XConsortium: waitfor.c,v 1.14 95/04/05 19:58:24 kaleb Exp $ */
/*
* waits for input
*/
diff --git a/xc/programs/xfs/xfs.man b/xc/programs/xfs/xfs.man
index 979bf8954..0d3f865ca 100644
--- a/xc/programs/xfs/xfs.man
+++ b/xc/programs/xfs/xfs.man
@@ -35,7 +35,7 @@
.\" no representations about the
.\" suitability of this software for any purpose. It is provided "as is"
.\" without express or implied warranty.
-.\" $XConsortium: xfs.man,v 1.10 94/04/17 19:55:50 dpw Exp gildea $
+.\" $XConsortium: xfs.man,v 1.11 94/10/03 23:13:21 gildea Exp $
.TH XFS 1 "Release 6" "X Version 11"
.SH NAME
xfs \- X font server
diff --git a/xc/programs/xhost/Imakefile b/xc/programs/xhost/Imakefile
index 0506d066f..a434369c5 100644
--- a/xc/programs/xhost/Imakefile
+++ b/xc/programs/xhost/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.12 93/09/26 15:40:50 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.13 94/02/06 10:50:53 rws Exp $
#if HasSecureRPC
RPC_DEFINES = -DSECURE_RPC
#else
diff --git a/xc/programs/xhost/xhost.c b/xc/programs/xhost/xhost.c
index 45e9db4ae..d352958d5 100644
--- a/xc/programs/xhost/xhost.c
+++ b/xc/programs/xhost/xhost.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xhost.c,v 11.62 94/04/17 20:23:18 rws Exp mor $ */
+/* $XConsortium: xhost.c,v 11.63 95/04/03 20:56:49 mor Exp $ */
/*
Copyright (c) 1985, 1986, 1987 X Consortium
diff --git a/xc/programs/xhost/xhost.man b/xc/programs/xhost/xhost.man
index 03ead02af..1d27d4767 100644
--- a/xc/programs/xhost/xhost.man
+++ b/xc/programs/xhost/xhost.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xhost.man,v 1.17 94/04/18 18:01:36 rws Exp $
+.\" $XConsortium: xhost.man,v 1.18 94/06/06 16:56:15 gildea Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xieperf/Imakefile b/xc/programs/xieperf/Imakefile
index 1faee7571..74867a3da 100644
--- a/xc/programs/xieperf/Imakefile
+++ b/xc/programs/xieperf/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.7 93/11/06 15:17:16 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.8 94/01/12 20:44:41 rws Exp $
SRCS = abort.c arith.c await.c band.c blend.c cache.c compare.c complex.c \
constrain.c convolve.c creatdstry.c cvttoindex.c dither.c \
diff --git a/xc/programs/xieperf/abort.c b/xc/programs/xieperf/abort.c
index 7a6b62bf3..78843b19d 100644
--- a/xc/programs/xieperf/abort.c
+++ b/xc/programs/xieperf/abort.c
@@ -1,4 +1,4 @@
-/* $XConsortium: abort.c,v 1.7 94/01/29 11:07:32 rws Exp $ */
+/* $XConsortium: abort.c,v 1.8 94/04/17 20:39:03 rws Exp $ */
/**** module abort.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/arith.c b/xc/programs/xieperf/arith.c
index ce83f2ef4..5e774550d 100644
--- a/xc/programs/xieperf/arith.c
+++ b/xc/programs/xieperf/arith.c
@@ -1,4 +1,4 @@
-/* $XConsortium: arith.c,v 1.5 94/02/13 12:02:23 rws Exp $ */
+/* $XConsortium: arith.c,v 1.6 94/04/17 20:39:03 rws Exp $ */
/**** module arith.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/await.c b/xc/programs/xieperf/await.c
index 7786660c9..5e229efbc 100644
--- a/xc/programs/xieperf/await.c
+++ b/xc/programs/xieperf/await.c
@@ -1,4 +1,4 @@
-/* $XConsortium: await.c,v 1.11 94/02/13 12:02:26 rws Exp $ */
+/* $XConsortium: await.c,v 1.12 94/04/17 20:39:06 rws Exp $ */
/**** module await.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/band.c b/xc/programs/xieperf/band.c
index e10f9cc63..9d84030fd 100644
--- a/xc/programs/xieperf/band.c
+++ b/xc/programs/xieperf/band.c
@@ -1,4 +1,4 @@
-/* $XConsortium: band.c,v 1.5 94/01/29 11:07:41 rws Exp $ */
+/* $XConsortium: band.c,v 1.6 94/04/17 20:39:07 rws Exp $ */
/**** module band.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/blend.c b/xc/programs/xieperf/blend.c
index a8cb92b26..68291d45b 100644
--- a/xc/programs/xieperf/blend.c
+++ b/xc/programs/xieperf/blend.c
@@ -1,4 +1,4 @@
-/* $XConsortium: blend.c,v 1.8 94/01/29 11:07:44 rws Exp $ */
+/* $XConsortium: blend.c,v 1.9 94/04/17 20:39:08 rws Exp $ */
/**** module blend.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/cache.c b/xc/programs/xieperf/cache.c
index f110179df..a0847f5d8 100644
--- a/xc/programs/xieperf/cache.c
+++ b/xc/programs/xieperf/cache.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cache.c,v 1.4 94/01/29 11:07:46 rws Exp $ */
+/* $XConsortium: cache.c,v 1.5 94/04/17 20:39:09 rws Exp $ */
/**** module cache.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/compare.c b/xc/programs/xieperf/compare.c
index e270a3ba7..3ed310e20 100644
--- a/xc/programs/xieperf/compare.c
+++ b/xc/programs/xieperf/compare.c
@@ -1,4 +1,4 @@
-/* $XConsortium: compare.c,v 1.4 94/01/29 11:07:49 rws Exp $ */
+/* $XConsortium: compare.c,v 1.5 94/04/17 20:39:09 rws Exp $ */
/**** module compare.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/complex.c b/xc/programs/xieperf/complex.c
index 1964c0e88..bfa2400cd 100644
--- a/xc/programs/xieperf/complex.c
+++ b/xc/programs/xieperf/complex.c
@@ -1,4 +1,4 @@
-/* $XConsortium: complex.c,v 1.3 94/02/13 12:02:29 rws Exp $ */
+/* $XConsortium: complex.c,v 1.4 94/04/17 20:39:10 rws Exp $ */
/**** module complex.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/constrain.c b/xc/programs/xieperf/constrain.c
index aac9f5cd3..ac13c629c 100644
--- a/xc/programs/xieperf/constrain.c
+++ b/xc/programs/xieperf/constrain.c
@@ -1,4 +1,4 @@
-/* $XConsortium: constrain.c,v 1.9 94/02/13 12:02:33 rws Exp $ */
+/* $XConsortium: constrain.c,v 1.10 94/04/17 20:39:11 rws Exp $ */
/**** module constrain.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/convolve.c b/xc/programs/xieperf/convolve.c
index b4e1c449d..0ae7bb972 100644
--- a/xc/programs/xieperf/convolve.c
+++ b/xc/programs/xieperf/convolve.c
@@ -1,4 +1,4 @@
-/* $XConsortium: convolve.c,v 1.5 94/02/13 12:02:36 rws Exp $ */
+/* $XConsortium: convolve.c,v 1.6 94/04/17 20:39:12 rws Exp $ */
/**** module convolve.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/creatdstry.c b/xc/programs/xieperf/creatdstry.c
index 32dfac982..d9433836d 100644
--- a/xc/programs/xieperf/creatdstry.c
+++ b/xc/programs/xieperf/creatdstry.c
@@ -1,4 +1,4 @@
-/* $XConsortium: creatdstry.c,v 1.6 94/01/29 11:07:58 rws Exp $ */
+/* $XConsortium: creatdstry.c,v 1.7 94/04/17 20:39:13 rws Exp $ */
/**** module creatdstry.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/cvttoindex.c b/xc/programs/xieperf/cvttoindex.c
index 04802c8db..a6343311d 100644
--- a/xc/programs/xieperf/cvttoindex.c
+++ b/xc/programs/xieperf/cvttoindex.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cvttoindex.c,v 1.9 94/02/13 12:03:31 rws Exp $ */
+/* $XConsortium: cvttoindex.c,v 1.10 94/04/17 20:39:13 rws Exp $ */
/**** module cvttoindex.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/dither.c b/xc/programs/xieperf/dither.c
index f20a68f69..59d318ffc 100644
--- a/xc/programs/xieperf/dither.c
+++ b/xc/programs/xieperf/dither.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dither.c,v 1.8 94/02/13 12:02:39 rws Exp $ */
+/* $XConsortium: dither.c,v 1.9 94/04/17 20:39:14 rws Exp $ */
/**** module dither.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/encode.c b/xc/programs/xieperf/encode.c
index 835cfc058..d3dbfb497 100644
--- a/xc/programs/xieperf/encode.c
+++ b/xc/programs/xieperf/encode.c
@@ -1,4 +1,4 @@
-/* $XConsortium: encode.c,v 1.7 94/02/13 12:02:43 rws Exp $ */
+/* $XConsortium: encode.c,v 1.8 94/04/17 20:39:15 rws Exp $ */
/**** module encode.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/errors.c b/xc/programs/xieperf/errors.c
index a2222583f..6b4098d55 100644
--- a/xc/programs/xieperf/errors.c
+++ b/xc/programs/xieperf/errors.c
@@ -1,4 +1,4 @@
-/* $XConsortium: errors.c,v 1.10 94/03/27 13:44:50 rws Exp $ */
+/* $XConsortium: errors.c,v 1.11 94/04/17 20:39:16 rws Exp $ */
/**** module errors.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/events.c b/xc/programs/xieperf/events.c
index a8ce8d6e8..72d2f6822 100644
--- a/xc/programs/xieperf/events.c
+++ b/xc/programs/xieperf/events.c
@@ -1,4 +1,4 @@
-/* $XConsortium: events.c,v 1.11 94/04/17 20:39:17 rws Exp kaleb $ */
+/* $XConsortium: events.c,v 1.12 95/04/05 19:59:08 kaleb Exp $ */
/**** module events.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/exportcl.c b/xc/programs/xieperf/exportcl.c
index 66c2a84e9..96f5c35af 100644
--- a/xc/programs/xieperf/exportcl.c
+++ b/xc/programs/xieperf/exportcl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: exportcl.c,v 1.13 94/02/13 12:02:54 rws Exp $ */
+/* $XConsortium: exportcl.c,v 1.14 94/04/17 20:39:18 rws Exp $ */
/**** module exportcl.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/funcode.c b/xc/programs/xieperf/funcode.c
index 469df7981..9f8d16fac 100644
--- a/xc/programs/xieperf/funcode.c
+++ b/xc/programs/xieperf/funcode.c
@@ -1,4 +1,4 @@
-/* $XConsortium: funcode.c,v 1.5 94/02/13 12:02:56 rws Exp $ */
+/* $XConsortium: funcode.c,v 1.6 94/04/17 20:39:19 rws Exp $ */
/**** module funcode.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/geometry.c b/xc/programs/xieperf/geometry.c
index 80fe20ed5..d8a554a9c 100644
--- a/xc/programs/xieperf/geometry.c
+++ b/xc/programs/xieperf/geometry.c
@@ -1,4 +1,4 @@
-/* $XConsortium: geometry.c,v 1.11 94/02/13 12:02:59 rws Exp $ */
+/* $XConsortium: geometry.c,v 1.12 94/04/17 20:39:20 rws Exp $ */
/**** module geometry.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/getnext.c b/xc/programs/xieperf/getnext.c
index c2be9d5b2..32b3ab353 100644
--- a/xc/programs/xieperf/getnext.c
+++ b/xc/programs/xieperf/getnext.c
@@ -1,4 +1,4 @@
-/* $XConsortium: getnext.c,v 1.6 94/01/29 11:08:21 rws Exp $ */
+/* $XConsortium: getnext.c,v 1.7 94/04/17 20:39:21 rws Exp $ */
/**** module getnext.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/import.c b/xc/programs/xieperf/import.c
index 59658f4ac..2340b0bda 100644
--- a/xc/programs/xieperf/import.c
+++ b/xc/programs/xieperf/import.c
@@ -1,4 +1,4 @@
-/* $XConsortium: import.c,v 1.7 94/01/29 11:08:23 rws Exp $ */
+/* $XConsortium: import.c,v 1.8 94/04/17 20:39:22 rws Exp $ */
/**** module import.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/importcl.c b/xc/programs/xieperf/importcl.c
index 1f396b129..c394d4866 100644
--- a/xc/programs/xieperf/importcl.c
+++ b/xc/programs/xieperf/importcl.c
@@ -1,4 +1,4 @@
-/* $XConsortium: importcl.c,v 1.10 94/02/13 12:03:02 rws Exp $ */
+/* $XConsortium: importcl.c,v 1.11 94/04/17 20:39:23 rws Exp $ */
/**** module importcl.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/logical.c b/xc/programs/xieperf/logical.c
index 35ef3777d..cc58005eb 100644
--- a/xc/programs/xieperf/logical.c
+++ b/xc/programs/xieperf/logical.c
@@ -1,4 +1,4 @@
-/* $XConsortium: logical.c,v 1.7 94/01/29 11:08:29 rws Exp $ */
+/* $XConsortium: logical.c,v 1.8 94/04/17 20:39:24 rws Exp $ */
/**** module logical.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/math.c b/xc/programs/xieperf/math.c
index 83b9c552b..a64e64d12 100644
--- a/xc/programs/xieperf/math.c
+++ b/xc/programs/xieperf/math.c
@@ -1,4 +1,4 @@
-/* $XConsortium: math.c,v 1.5 94/02/13 12:03:04 rws Exp $ */
+/* $XConsortium: math.c,v 1.6 94/04/17 20:39:25 rws Exp $ */
/**** module math.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/modify.c b/xc/programs/xieperf/modify.c
index 547ddc660..c629c27c1 100644
--- a/xc/programs/xieperf/modify.c
+++ b/xc/programs/xieperf/modify.c
@@ -1,4 +1,4 @@
-/* $XConsortium: modify.c,v 1.11 94/01/29 11:08:33 rws Exp $ */
+/* $XConsortium: modify.c,v 1.12 94/04/17 20:39:26 rws Exp $ */
/**** module modify.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/mtchhist.c b/xc/programs/xieperf/mtchhist.c
index 2ffd1b30c..78eb4920a 100644
--- a/xc/programs/xieperf/mtchhist.c
+++ b/xc/programs/xieperf/mtchhist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mtchhist.c,v 1.5 94/02/13 12:03:07 rws Exp $ */
+/* $XConsortium: mtchhist.c,v 1.6 94/04/17 20:39:27 rws Exp $ */
/**** module mtchhist.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/pasteup.c b/xc/programs/xieperf/pasteup.c
index c75fbe26d..b98b9d08a 100644
--- a/xc/programs/xieperf/pasteup.c
+++ b/xc/programs/xieperf/pasteup.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pasteup.c,v 1.8 94/01/29 11:08:38 rws Exp $ */
+/* $XConsortium: pasteup.c,v 1.9 94/04/17 20:39:27 rws Exp $ */
/**** module pasteup.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/point.c b/xc/programs/xieperf/point.c
index bff822e73..48c89dc8c 100644
--- a/xc/programs/xieperf/point.c
+++ b/xc/programs/xieperf/point.c
@@ -1,4 +1,4 @@
-/* $XConsortium: point.c,v 1.9 94/01/29 11:08:41 rws Exp $ */
+/* $XConsortium: point.c,v 1.10 94/04/17 20:39:28 rws Exp $ */
/**** module point.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/purgecolst.c b/xc/programs/xieperf/purgecolst.c
index ba37e4fe2..ad8c29d1d 100644
--- a/xc/programs/xieperf/purgecolst.c
+++ b/xc/programs/xieperf/purgecolst.c
@@ -1,4 +1,4 @@
-/* $XConsortium: purgecolst.c,v 1.4 94/01/29 11:08:43 rws Exp $ */
+/* $XConsortium: purgecolst.c,v 1.5 94/04/17 20:39:29 rws Exp $ */
/**** module purgecolst.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/query.c b/xc/programs/xieperf/query.c
index c0ec2f058..36543b7cb 100644
--- a/xc/programs/xieperf/query.c
+++ b/xc/programs/xieperf/query.c
@@ -1,4 +1,4 @@
-/* $XConsortium: query.c,v 1.9 94/02/13 12:03:09 rws Exp $ */
+/* $XConsortium: query.c,v 1.10 94/04/17 20:39:30 rws Exp $ */
/**** module query.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/redefine.c b/xc/programs/xieperf/redefine.c
index 7a9c83e34..6a37ccbc2 100644
--- a/xc/programs/xieperf/redefine.c
+++ b/xc/programs/xieperf/redefine.c
@@ -1,4 +1,4 @@
-/* $XConsortium: redefine.c,v 1.7 94/01/29 11:08:47 rws Exp $ */
+/* $XConsortium: redefine.c,v 1.8 94/04/17 20:39:31 rws Exp $ */
/**** module redefine.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/rgb.c b/xc/programs/xieperf/rgb.c
index e7e1b8175..94c9fa499 100644
--- a/xc/programs/xieperf/rgb.c
+++ b/xc/programs/xieperf/rgb.c
@@ -1,4 +1,4 @@
-/* $XConsortium: rgb.c,v 1.6 94/02/13 12:03:12 rws Exp $ */
+/* $XConsortium: rgb.c,v 1.7 94/04/17 20:39:31 rws Exp $ */
/**** module rgb.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/tests.c b/xc/programs/xieperf/tests.c
index 994fa5dd5..c542357c1 100644
--- a/xc/programs/xieperf/tests.c
+++ b/xc/programs/xieperf/tests.c
@@ -1,4 +1,4 @@
-/* $XConsortium: tests.c,v 1.13 94/01/29 11:08:52 rws Exp $ */
+/* $XConsortium: tests.c,v 1.14 94/04/17 20:39:34 rws Exp $ */
/**** module tests.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/uconstrain.c b/xc/programs/xieperf/uconstrain.c
index ea354d229..c81c294a4 100644
--- a/xc/programs/xieperf/uconstrain.c
+++ b/xc/programs/xieperf/uconstrain.c
@@ -1,4 +1,4 @@
-/* $XConsortium: uconstrain.c,v 1.7 94/02/13 12:03:15 rws Exp $ */
+/* $XConsortium: uconstrain.c,v 1.8 94/04/17 20:39:38 rws Exp $ */
/**** module uconstrain.c ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/xieperf.c b/xc/programs/xieperf/xieperf.c
index b15e1ed24..e02b0c14a 100644
--- a/xc/programs/xieperf/xieperf.c
+++ b/xc/programs/xieperf/xieperf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xieperf.c,v 1.37 94/03/28 18:31:18 gildea Exp $ */
+/* $XConsortium: xieperf.c,v 1.38 94/04/17 20:39:40 gildea Exp $ */
/**** module xieperf.c ****/
/****************************************************************************
diff --git a/xc/programs/xieperf/xieperf.h b/xc/programs/xieperf/xieperf.h
index f71254b11..2dd04db0d 100644
--- a/xc/programs/xieperf/xieperf.h
+++ b/xc/programs/xieperf/xieperf.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xieperf.h,v 1.15 94/01/29 11:09:12 rws Exp $ */
+/* $XConsortium: xieperf.h,v 1.16 94/04/17 20:39:42 rws Exp $ */
/**** module xieperf.h ****/
/******************************************************************************
diff --git a/xc/programs/xieperf/xieperf.man b/xc/programs/xieperf/xieperf.man
index baabba47c..8d92777c3 100644
--- a/xc/programs/xieperf/xieperf.man
+++ b/xc/programs/xieperf/xieperf.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xieperf.man,v 1.5 94/04/17 20:39:43 rws Exp $
+.\" $XConsortium: xieperf.man,v 1.6 94/04/18 18:35:30 rws Exp $
.\" Copyright (c) 1993, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xinit/Imakefile b/xc/programs/xinit/Imakefile
index b8d030efd..fa80d2882 100644
--- a/xc/programs/xinit/Imakefile
+++ b/xc/programs/xinit/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.23 93/05/28 11:46:47 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.24 93/09/21 17:58:25 kaleb Exp $
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK
#endif
diff --git a/xc/programs/xinit/startx.cpp b/xc/programs/xinit/startx.cpp
index 2c40b8aa6..6098b80a5 100644
--- a/xc/programs/xinit/startx.cpp
+++ b/xc/programs/xinit/startx.cpp
@@ -1,6 +1,6 @@
XCOMM!/bin/sh
-XCOMM $XConsortium$
+XCOMM $XConsortium: startx.cpp,v 1.4 91/08/22 11:41:29 rws Exp $
XCOMM
XCOMM This is just a sample implementation of a slightly less primitive
XCOMM interface than xinit. It looks for user .xinitrc and .xserverrc
diff --git a/xc/programs/xinit/startx.man b/xc/programs/xinit/startx.man
index 5a9826ed7..a0dd8cf3d 100644
--- a/xc/programs/xinit/startx.man
+++ b/xc/programs/xinit/startx.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: startx.man,v 1.5 94/04/13 17:25:38 gildea Exp $
+.\" $XConsortium: startx.man,v 1.6 94/04/17 20:24:29 gildea Exp $
.\" Copyright (c) 1993 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xinit/xinit.c b/xc/programs/xinit/xinit.c
index 2120520f4..656af4fc0 100644
--- a/xc/programs/xinit/xinit.c
+++ b/xc/programs/xinit/xinit.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xinit.c,v 11.60 94/12/12 15:57:46 kaleb Exp kaleb $ */
+/* $XConsortium: xinit.c,v 11.61 95/01/09 21:20:29 kaleb Exp $ */
/*
diff --git a/xc/programs/xinit/xinit.man b/xc/programs/xinit/xinit.man
index 816e09342..8a7c1eeba 100644
--- a/xc/programs/xinit/xinit.man
+++ b/xc/programs/xinit/xinit.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xinit.man,v 1.21 94/04/14 11:48:27 dpw Exp $
+.\" $XConsortium: xinit.man,v 1.22 94/04/17 20:24:31 dpw Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xinit/xinitrc.cpp b/xc/programs/xinit/xinitrc.cpp
index ca533a02a..a3022aada 100644
--- a/xc/programs/xinit/xinitrc.cpp
+++ b/xc/programs/xinit/xinitrc.cpp
@@ -1,5 +1,5 @@
XCOMM!/bin/sh
-XCOMM $XConsortium$
+XCOMM $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
diff --git a/xc/programs/xkbcomp/Imakefile b/xc/programs/xkbcomp/Imakefile
index 1f2b2c058..56378a3e8 100644
--- a/xc/programs/xkbcomp/Imakefile
+++ b/xc/programs/xkbcomp/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.5 94/04/08 15:21:32 erik Exp $
+XCOMM $XConsortium: Imakefile,v 1.6 94/04/08 15:43:27 erik Exp $
#define IHaveSubdirs
#define PassCDebugFlags
diff --git a/xc/programs/xkbcomp/action.c b/xc/programs/xkbcomp/action.c
index 70de0739b..eb088643e 100644
--- a/xc/programs/xkbcomp/action.c
+++ b/xc/programs/xkbcomp/action.c
@@ -1,4 +1,4 @@
-/* $XConsortium: action.c,v 1.3 94/04/04 15:28:02 rws Exp $ */
+/* $XConsortium: action.c,v 1.5 94/04/08 15:21:53 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/action.h b/xc/programs/xkbcomp/action.h
index 075acfd46..eaffd7bd7 100644
--- a/xc/programs/xkbcomp/action.h
+++ b/xc/programs/xkbcomp/action.h
@@ -1,4 +1,4 @@
-/* $XConsortium: action.h,v 1.4 93/09/28 20:16:45 rws Exp $ */
+/* $XConsortium: action.h,v 1.1 94/04/02 17:05:07 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/compat.c b/xc/programs/xkbcomp/compat.c
index 4104d700e..3e0ea3877 100644
--- a/xc/programs/xkbcomp/compat.c
+++ b/xc/programs/xkbcomp/compat.c
@@ -1,4 +1,4 @@
-/* $XConsortium: compat.c,v 1.2 94/04/04 15:28:08 rws Exp $ */
+/* $XConsortium: compat.c,v 1.3 94/04/08 15:22:28 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/compat/basic b/xc/programs/xkbcomp/compat/basic
index 93eee256b..703c37d49 100644
--- a/xc/programs/xkbcomp/compat/basic
+++ b/xc/programs/xkbcomp/compat/basic
@@ -1,4 +1,4 @@
-// $XConsortium: basic.h,v 1.2 94/04/04 15:28:46 erik Exp $
+// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
xkb_compatibility "basic"
// Minimal set of symbol interpretations to provide reasonable
diff --git a/xc/programs/xkbcomp/compat/complete b/xc/programs/xkbcomp/compat/complete
index 69562e1e1..5365ec7d8 100644
--- a/xc/programs/xkbcomp/compat/complete
+++ b/xc/programs/xkbcomp/compat/complete
@@ -1,4 +1,4 @@
-// $XConsortium: basic.h,v 1.2 94/04/04 15:28:46 erik Exp $
+// $XConsortium: complete,v 1.2 94/04/08 15:54:51 erik Exp $
xkb_compatibility "default"
include "basic"
diff --git a/xc/programs/xkbcomp/compat/default b/xc/programs/xkbcomp/compat/default
index 8ae734b17..9fd5ee6a5 100644
--- a/xc/programs/xkbcomp/compat/default
+++ b/xc/programs/xkbcomp/compat/default
@@ -1,4 +1,4 @@
-// $XConsortium: basic.h,v 1.2 94/04/04 15:28:46 erik Exp $
+// $XConsortium: default,v 1.3 94/04/08 15:54:52 erik Exp $
xkb_compatibility "default"
include "basic"
diff --git a/xc/programs/xkbcomp/compat/iso9995 b/xc/programs/xkbcomp/compat/iso9995
index 767dcfe52..76d728e8b 100644
--- a/xc/programs/xkbcomp/compat/iso9995
+++ b/xc/programs/xkbcomp/compat/iso9995
@@ -1,4 +1,4 @@
-// $XConsortium: basic.h,v 1.2 94/04/04 15:28:46 erik Exp $
+// $XConsortium: iso9995,v 1.3 94/04/08 15:54:52 erik Exp $
xkb_compatibility "default"
// Fairly complete set of symbol interpretations to provide reasonable
diff --git a/xc/programs/xkbcomp/compat/misc b/xc/programs/xkbcomp/compat/misc
index 97b422ff0..6c61ffe68 100644
--- a/xc/programs/xkbcomp/compat/misc
+++ b/xc/programs/xkbcomp/compat/misc
@@ -1,4 +1,4 @@
-// $XConsortium: basic.h,v 1.2 94/04/04 15:28:46 erik Exp $
+// $XConsortium: misc,v 1.2 94/04/08 15:54:52 erik Exp $
xkb_compatibility "misc"
// Interpretations miscellaneous other keys that might be usefule
diff --git a/xc/programs/xkbcomp/compat/mousekeys b/xc/programs/xkbcomp/compat/mousekeys
index f1b194146..1a556bb53 100644
--- a/xc/programs/xkbcomp/compat/mousekeys
+++ b/xc/programs/xkbcomp/compat/mousekeys
@@ -1,4 +1,4 @@
-// $XConsortium: basic.h,v 1.2 94/04/04 15:28:46 erik Exp $
+// $XConsortium: mousekeys,v 1.2 94/04/08 15:54:52 erik Exp $
xkb_compatibility "mousekeys"
// Interpretations for arrow keys and a few other common keysyms which
diff --git a/xc/programs/xkbcomp/cout.c b/xc/programs/xkbcomp/cout.c
deleted file mode 100644
index f4a1bc0d4..000000000
--- a/xc/programs/xkbcomp/cout.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/* $XConsortium: cout.c,v 1.1 94/04/02 17:05:22 erik Exp $ */
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- 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.
-
- ********************************************************/
-
-#include "xkbcomp.h"
-#include "tokens.h"
-#include "misc.h"
-
-#include <ctype.h>
-
-#define lowbit(x) ((x) & (-(x)))
-
-static char *
-CHdrTokenText(tok)
-StringToken tok;
-{
-static char buf[32];
-char *tmp;
-
- strcpy(buf,stText(tok));
- for (tmp=buf;*tmp!='\0';tmp++) {
- if ((tmp==buf)&&(!isalpha(*tmp)))
- *tmp= '_';
- else if (!isalnum(*tmp))
- *tmp= '_';
- }
- return buf;
-}
-
-static Bool
-WriteCHdrVMods(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i,bit,nOut;
-
- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods))
- return False;
- for (i=nOut=0;i<XkbNumVirtualMods;i++) {
- if (xkb->names->vmods[i]!=(Atom)NullStringToken) {
- fprintf(file,"%s#define vmod_%s %d\n",(nOut<1?"\n":""),
- CHdrTokenText(xkb->names->vmods[i]),i);
- nOut++;
- }
- }
- for (i=nOut=0;i<XkbNumVirtualMods;i++) {
- if (xkb->names->vmods[i]!=(Atom)NullStringToken) {
- fprintf(file,"%s#define vmod_%sMask (1<<%d)\n",
- (nOut<1?"\n":""),
- CHdrTokenText(xkb->names->vmods[i]),i);
- nOut++;
- }
- }
- if (nOut>0)
- fprintf(file,"\n");
- return True;
-}
-
-static char *
-CHdrVModMaskText(xkb,mask)
- XkbDescPtr xkb;
- unsigned mask;
-{
-register int i,bit;
-static char buf[64];
-register char *str;
-StringToken *names;
-
- if (mask==0) {
- strcpy(buf,"0");
- return buf;
- }
- if ((xkb==NULL)||(xkb->names==NULL)||(xkb->names->vmods==NULL)) {
- sprintf(buf,"0x%04x",mask);
- return buf;
- }
- names= (StringToken *)xkb->names->vmods;
- str= buf;
- for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
- if (mask&bit) {
- if (str!=buf) *str++= '|';
- if (xkb->names->vmods[i]!=(Atom)NullStringToken)
- sprintf(str,"vmod_%sMask",CHdrTokenText(names[i]));
- else sprintf(str,"0x%x",bit);
- str= &str[strlen(str)];
- }
- }
- return buf;
-}
-
-static Bool
-WriteCHdrKeycodes(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-StringToken kcName;
-register int i;
-char buf[8],buf2[8];
-
- if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
- uInternalError("Key names not defined in WriteCHdrKeycodes\n");
- return False;
- }
- kcName= (StringToken)xkb->names->keycodes;
- buf[4]= '\0';
- if (xkb->names->keycodes!=NullStringToken)
- fprintf(file,"/* keycodes name is \"%s\" */\n",stText(kcName));
- fprintf(file,"static XkbKeyNameRec keyNames[NUM_KEYS]= {\n");
- for (i=0;i<=xkb->max_key_code;i++) {
- memcpy(buf,xkb->names->keys[i].name,4);
- sprintf(buf2,"\"%s\"",buf);
- if (i!=xkb->max_key_code) {
- fprintf(file," { %6s },",buf2);
- if ((i&3)==3)
- fprintf(file,"\n");
- }
- else {
- fprintf(file," { %6s }\n",buf2);
- }
- }
- fprintf(file,"};\n");
- return True;
-}
-
-static void
-WriteTypePreserve(file,prefix,xkb,type)
- FILE * file;
- char * prefix;
- XkbDescPtr xkb;
- XkbKeyTypePtr type;
-{
-register int i;
-XkbKTPreservePtr pre;
-
- fprintf(file,"static XkbKTPreserveRec preserve_%s[%d]= {\n",prefix,
- type->map_count);
- for (i=0,pre=type->preserve;i<type->map_count;i++,pre++) {
- if (i!=0)
- fprintf(file,",\n");
- fprintf(file," { %15s, ",modMaskText(pre->mask,XkbCHeaderFile));
- fprintf(file,"%15s, ",modMaskText(pre->real_mods,XkbCHeaderFile));
- fprintf(file,"%15s }",CHdrVModMaskText(xkb,pre->vmods));
- }
- fprintf(file,"\n};\n");
- return;
-}
-
-static void
-WriteTypeInitFunc(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i,n;
-XkbKeyTypePtr type;
-StringToken * names;
-char prefix[32];
-
- fprintf(file,"\n\nstatic void\ninitTypeNames(dpy)\nDPYTYPE dpy;\n{\n");
- for (i=0,type=xkb->map->types;i<xkb->map->num_types;i++,type++) {
- strcpy(prefix,CHdrTokenText(type->name));
- if (type->name!=(Atom)NullStringToken)
- fprintf(file," dflt_types[%d].name= GET_ATOM(dpy,\"%s\");\n",i,
- stGetString(type->name));
- names= (StringToken *)type->lvl_names;
- if (names!=NULL) {
- for (n=0;n<type->group_width;n++) {
- if (names[n]==NullStringToken)
- continue;
- fprintf(file," lnames_%s[%d]= ",prefix,n);
- fprintf(file,"GET_ATOM(dpy,\"%s\");\n",stGetString(names[n]));
- }
- }
- }
- fprintf(file,"}\n");
- return;
-}
-
-static Bool
-WriteCHdrKeyTypes(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i,n;
-XkbClientMapPtr map;
-XkbKeyTypePtr type;
-char prefix[32];
-
- if ((!xkb)||(!xkb->map)||(!xkb->map->types)) {
- uInternalError("Key types not defined in WriteCHdrKeyTypes\n");
- return False;
- }
- map= xkb->map;
- if ((xkb->names!=NULL)&&(xkb->names->semantics!=NullStringToken)) {
- fprintf(file,"/* semantics name is \"%s\" */\n",
- stText(xkb->names->semantics));
- }
- for (i=0,type=map->types;i<map->num_types;i++,type++) {
- strcpy(prefix,CHdrTokenText(type->name));
-
- if (type->map_count>0) {
- XkbKTMapEntryPtr entry;
- entry= type->map;
- fprintf(file,"static XkbKTMapEntryRec map_%s[%d]= {\n",prefix,
- type->map_count);
- for (n=0;n<type->map_count;n++,entry++) {
- if (n!=0)
- fprintf(file,",\n");
- fprintf(file," { %d, %15s, %6d, %15s, %15s }",
- entry->active,
- modMaskText(entry->mask,XkbCHeaderFile),
- entry->level,
- modMaskText(entry->real_mods,XkbCHeaderFile),
- CHdrVModMaskText(xkb,entry->vmods));
- }
- fprintf(file,"\n};\n");
-
- if (type->preserve)
- WriteTypePreserve(file,prefix,xkb,type);
- }
- if (type->lvl_names!=NULL) {
- fprintf(file,"static Atom lnames_%s[%d];\n",prefix,
- type->group_width);
- }
- fprintf(file,"\n");
- }
- fprintf(file,"static XkbKeyTypeRec dflt_types[]= {\n");
- for (i=0,type=map->types;i<map->num_types;i++,type++) {
- strcpy(prefix,CHdrTokenText(type->name));
- if (i!=0) fprintf(file,",\n");
- fprintf(file," {\n %s,\n",modMaskText(type->mask,XkbCHeaderFile));
- fprintf(file," %s,",modMaskText(type->real_mods,XkbCHeaderFile));
- fprintf(file," %s,\n",CHdrVModMaskText(xkb,type->vmods));
- fprintf(file,
- " %d, XkbNoFreeKTStruct|XkbNoFreeKTMap|XkbNoFreeKTLevelNames%s,\n",
- type->group_width,(type->preserve?"|XkbNoFreeKTPreserve":""));
- fprintf(file," %d,",type->map_count);
- if (type->map_count>0)
- fprintf(file," map_%s,",prefix);
- else fprintf(file," NULL,");
- if (type->preserve)
- fprintf(file," preserve_%s,\n",prefix);
- else fprintf(file," NULL,\n");
- if (type->lvl_names!=NULL)
- fprintf(file," None, lnames_%s\n }",prefix);
- else fprintf(file," None, NULL\n }",prefix);
- }
- fprintf(file,"\n};\n");
- fprintf(file,"#define num_dflt_types (sizeof(dflt_types)/sizeof(XkbKeyTypeRec))\n");
- WriteTypeInitFunc(file,xkb);
- return True;
-}
-
-static Bool
-WriteCHdrCompatMap(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i;
-XkbCompatPtr compat;
-XkbSymInterpretPtr interp;
-
- if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)) {
- uInternalError("Sym interpretations not defined in WriteCHdrInterp\n");
- return False;
- }
- compat= xkb->compat;
- if ((xkb->names!=NULL)&&(xkb->names->semantics!=NullStringToken)) {
- fprintf(file,"/* semantics name is \"%s\" */\n",
- stText(xkb->names->semantics));
- }
- fprintf(file,"static XkbSymInterpretRec dfltSI[%d]= {\n",
- compat->num_si);
- interp= compat->sym_interpret;
- for (i=0;i<compat->num_si;i++,interp++) {
- XkbAction *act;
- act= (XkbAction *)&interp->act;
- if (i!=0) fprintf(file,",\n");
- fprintf(file," { %s, ",keysymText(interp->sym,XkbCHeaderFile));
- fprintf(file,"0x%04x,\n",interp->flags);
- fprintf(file," %s, ",SIMatchText(interp->match,XkbCHeaderFile));
- fprintf(file,"%s,\n",modMaskText(interp->mods,XkbCHeaderFile));
- fprintf(file," %d,\n",interp->virtual_mod);
- fprintf(file," { %s, ",actionTypeText(interp->act.type,
- XkbCHeaderFile));
- fprintf(file," 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x ",
- interp->act.data[0], interp->act.data[1],
- interp->act.data[2], interp->act.data[3],
- interp->act.data[4], interp->act.data[5],
- interp->act.data[6]);
- fprintf(file," } }");
-#ifdef DEBUG
- if (debugFlags)
- fflush(file);
-#endif
- }
- fprintf(file,"\n};\n");
- fprintf(file,
- "#define num_dfltSI (sizeof(dfltSI)/sizeof(XkbSymInterpretRec))\n");
- fprintf(file,"\nstatic XkbCompatRec compatMap= {\n");
- fprintf(file," dfltSI,\n");
- fprintf(file," { /* real modifiers */");
- for (i=0;i<XkbNumModifiers;i++) {
- XkbModCompatPtr mc;
- mc= &xkb->compat->real_mod_compat[i];
- if (i==0) fprintf(file,"\n { ");
- else if (i&1) fprintf(file,", { ");
- else fprintf(file,",\n { ");
- fprintf(file,"%20s, 0x%02x }",modMaskText(mc->mods,XkbCHeaderFile),
- mc->groups);
- }
- fprintf(file,"\n },\n { /* virtual modifiers */");
- for (i=0;i<XkbNumVirtualMods;i++) {
- XkbModCompatPtr mc;
- mc= &xkb->compat->vmod_compat[i];
- if (i==0) fprintf(file,"\n { ");
- else if (i&1) fprintf(file,", { ");
- else fprintf(file,",\n { ");
- fprintf(file,"%20s, 0x%02x }",modMaskText(mc->mods,XkbCHeaderFile),
- mc->groups);
- }
- fprintf(file,"\n },\n");
- fprintf(file," {\n");
- for (i=0;i<XkbNumModifiers;i+= 2) {
- if (i==0)
- fprintf(file,"\n &compatMap.real_mod_compat[%d], ",i);
- else fprintf(file,",\n &compatMap.real_mod_compat[%d], ",i);
- fprintf(file," &compatMap.real_mod_compat[%d] ",i+1);
- }
- fprintf(file,"\n }, /* effective mod_compat */\n");
- fprintf(file," num_dfltSI, num_dfltSI\n");
- fprintf(file,"};\n\n");
- return True;
-}
-
-static Bool
-WriteCHdrSymbols(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i;
-
- if ((!xkb)||(!xkb->map)||(!xkb->map->syms)||(!xkb->map->key_sym_map)) {
- uInternalError("Symbols not defined in WriteCHdrSymbols\n");
- return False;
- }
- fprintf(file,"#define NUM_SYMBOLS %d\n",xkb->map->num_syms);
- if (xkb->map->num_syms>0) {
- register KeySym *sym;
- sym= xkb->map->syms;
- fprintf(file,"static KeySym symCache[NUM_SYMBOLS]= {\n");
- for (i=0;i<xkb->map->num_syms;i++,sym++) {
- if (i==0) fprintf(file," ");
- else if (i%4==0) fprintf(file,",\n ");
- else fprintf(file,", ");
- fprintf(file,"%15s",keysymText(*sym,XkbCHeaderFile));
- }
- fprintf(file,"\n};\n");
- }
- if (xkb->max_key_code>0) {
- register XkbSymMapPtr map;
- map= xkb->map->key_sym_map;
- fprintf(file,"static XkbSymMapRec symMap[NUM_KEYS]= {\n");
- for (i=0;i<=xkb->max_key_code;i++,map++) {
- if (i==0) fprintf(file," ");
- else if ((i&3)==0) fprintf(file,",\n ");
- else fprintf(file,", ");
- fprintf(file,"{ %2d, 0x%x, %3d }",map->kt_index,map->group_info,
- map->offset);
- }
- fprintf(file,"\n};\n");
- }
- return True;
-}
-
-static Bool
-WriteCHdrClientMap(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i;
-
- if ((!xkb)||(!xkb->map)||(!xkb->map->syms)||(!xkb->map->key_sym_map)) {
- uInternalError("Symbols not defined in WriteCHdrSymbols\n");
- return False;
- }
- if (!WriteCHdrKeyTypes(file,xkb))
- return False;
- if (!WriteCHdrSymbols(file,xkb))
- return False;
- fprintf(file,"static XkbClientMapRec clientMap= {\n");
- fprintf(file," NUM_TYPES, NUM_TYPES, types, \n");
- fprintf(file," NUM_SYMBOLS, NUM_SYMBOLS, symCache, symMap\n");
- fprintf(file,"};\n\n");
-}
-
-static Bool
-WriteCHdrServerMap(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i;
-
- if ((!xkb)||(!xkb->map)||(!xkb->map->syms)||(!xkb->map->key_sym_map)) {
- uInternalError("Symbols not defined in WriteCHdrSymbols\n");
- return False;
- }
- if (xkb->server->num_acts>0) {
- register XkbAnyAction *act;
- act= (XkbAnyAction *)xkb->server->acts;
- fprintf(file,"#define NUM_ACTIONS %d\n",xkb->server->num_acts);
- fprintf(file,"static XkbAnyAction actionCache[NUM_ACTIONS]= {\n");
- for (i=0;i<xkb->server->num_acts;i++,act++) {
- if (i==0) fprintf(file," ");
- else fprintf(file,",\n ");
- fprintf(file,"{ %20s, ",actionTypeText(act->type,XkbCHeaderFile));
- fprintf(file," 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x }",
- act->data[0], act->data[1], act->data[2], act->data[3],
- act->data[4], act->data[5], act->data[6]);
- }
- fprintf(file,"\n};\n");
- }
- fprintf(file,"static unsigned short keyActions[NUM_KEYS]= {\n");
- for (i=0;i<=xkb->max_key_code;i++) {
- if (i==0) fprintf(file," ");
- else if ((i&0xf)==0) fprintf(file,",\n ");
- else fprintf(file,", ");
- fprintf(file,"%2d",xkb->server->key_acts[i]);
- }
- fprintf(file,"\n};\n");
- fprintf(file,"static XkbBehavior behaviors[NUM_KEYS]= {\n");
- for (i=0;i<=xkb->max_key_code;i++) {
- if (i==0) fprintf(file," ");
- else if ((i&0x3)==0) fprintf(file,",\n ");
- else fprintf(file,", ");
- if (xkb->server->behaviors) {
- if (xkb->server->behaviors[i].type==XkbKB_Default)
- fprintf(file,"{ 0, 0 }");
- else fprintf(file,"{ 0x%02x, 0x%02x }",
- xkb->server->behaviors[i].type,
- xkb->server->behaviors[i].data);
- }
- else fprintf(file,"{ 0, 0 }");
- }
- fprintf(file,"\n};\n");
- fprintf(file,"static unsigned char explicit[NUM_KEYS]= {\n");
- for (i=0;i<=xkb->max_key_code;i++) {
- if (i==0) fprintf(file," ");
- else if ((i&0x7)==0) fprintf(file,",\n ");
- else fprintf(file,", ");
- if ((xkb->server->explicit==NULL)||(xkb->server->explicit[i]==0))
- fprintf(file," 0");
- else fprintf(file,"0x%02x",xkb->server->explicit[i]);
- }
- fprintf(file,"\n};\n");
- fprintf(file,"static XkbServerMapRec serverMap= {\n");
- fprintf(file," %d, %d, (XkbAction *)actionCache,\n",
- xkb->server->num_acts,xkb->server->num_acts);
- fprintf(file," behaviors, keyActions, explicit,\n");
- for (i=0;i<XkbNumVirtualMods;i++) {
- if (i==0) fprintf(file," { ");
- else if (i==8) fprintf(file,",\n ");
- else fprintf(file,", ");
- fprintf(file,"%3d",xkb->server->vmods[i]);
- }
- fprintf(file," }\n");
- fprintf(file,"};\n\n");
-}
-
-static Bool
-WriteCHdrLayout(file,result)
- FILE * file;
- XkbFileResult * result;
-{
-Bool ok;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- ok= WriteCHdrVMods(file,xkb);
- ok= ok&&WriteCHdrKeycodes(file,xkb);
- ok= ok&&WriteCHdrSymbols(file,xkb);
-#ifdef NOTDEF
- ok= ok&&WriteCHdrGeometry(file,xkb);
-#endif
- return ok;
-}
-
-static Bool
-WriteCHdrSemantics(file,result)
- FILE * file;
- XkbFileResult * result;
-{
-Bool ok;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- ok= WriteCHdrVMods(file,xkb);
- ok= WriteCHdrKeyTypes(file,xkb);
- ok= WriteCHdrCompatMap(file,xkb);
- return ok;
-}
-
-static Bool
-WriteCHdrKeymap(file,result)
- FILE * file;
- XkbFileResult * result;
-{
-Bool ok;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- ok= WriteCHdrVMods(file,xkb);
- ok= ok&&WriteCHdrKeycodes(file,xkb);
- ok= ok&&WriteCHdrClientMap(file,xkb);
- ok= ok&&WriteCHdrServerMap(file,xkb);
- ok= ok&&WriteCHdrCompatMap(file,xkb);
-#ifdef NOTDEF
- ok= ok&&WriteCHdrGeometry(file,xkb);
-#endif
- return ok;
-}
-
-Bool
-WriteCKbdDesc(name,type,result)
- char * name;
- unsigned type;
- XkbFileResult * result;
-{
-FILE * out;
-Bool ok;
-Bool (*func)();
-XkbDescPtr xkb;
-
- switch (type) {
- case XkmSemanticsFile:
- func= WriteCHdrSemantics;
- break;
- case XkmLayoutFile:
- func= WriteCHdrLayout;
- break;
- case XkmKeymapFile:
- func= WriteCHdrKeymap;
- break;
- default:
- uInternalError("Illegal file type %d in WriteCKbdDesc\n",type);
- break;
- }
- xkb= &result->xkb;
- out= fopen(name,"w");
- if (out==NULL) {
- uError("Couldn't open output file \"%s\"\n",name);
- ok= False;
- }
- else {
- char *tmp,*hdrdef;
- tmp= strrchr(name,'/');
- if (tmp==NULL)
- tmp= name;
- else tmp++;
- hdrdef= uTypedCalloc(strlen(tmp+1),char);
- if (hdrdef) {
- strcpy(hdrdef,tmp);
- tmp= hdrdef;
- while (*tmp) {
- if (islower(*tmp)) *tmp= toupper(*tmp);
- else if (!isalnum(*tmp)) *tmp= '_';
- tmp++;
- }
- fprintf(out,"/* THIS FILE GENERATED AUTOMATICALLY BY XKBCOMP */\n");
- fprintf(out,"#ifndef %s\n",hdrdef);
- fprintf(out,"#define %s 1\n\n",hdrdef);
- fprintf(out,"#ifndef XKB_IN_SERVER\n");
- fprintf(out,"#define GET_ATOM(d,s) XInternAtom(d,s,0)\n");
- fprintf(out,"#define DPYTYPE Display *\n");
- fprintf(out,"#else\n");
- fprintf(out,"#define GET_ATOM(d,s) MakeAtom(s,strlen(s),1)\n");
- fprintf(out,"#define DPYTYPE char *\n");
- fprintf(out,"#endif\n");
- fprintf(out,"#define NUM_KEYS %d\n",xkb->max_key_code+1);
- }
- else {
- uInternalError("Couldn't allocate buffer for header define\n");
- uAction("Generated C file will not be bracketed by #ifdef's\n");
- }
- ok= (*func)(out,result);
- if (hdrdef)
- fprintf(out,"#endif /* %s */\n",hdrdef);
- fclose(out);
- }
-
- if (!ok) {
- uAction("Key Map source not written\n");
- return False;
- }
- return True;
-}
diff --git a/xc/programs/xkbcomp/expr.c b/xc/programs/xkbcomp/expr.c
index 185c0777d..0e9db61e8 100644
--- a/xc/programs/xkbcomp/expr.c
+++ b/xc/programs/xkbcomp/expr.c
@@ -1,4 +1,4 @@
-/* $XConsortium: expr.c,v 1.2 94/04/04 15:28:15 rws Exp $ */
+/* $XConsortium: expr.c,v 1.4 94/04/08 15:25:04 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/expr.h b/xc/programs/xkbcomp/expr.h
index 2bf554f9b..65a03af26 100644
--- a/xc/programs/xkbcomp/expr.h
+++ b/xc/programs/xkbcomp/expr.h
@@ -1,4 +1,4 @@
-/* $XConsortium: expr.h,v 1.4 93/09/28 20:16:45 rws Exp $ */
+/* $XConsortium: expr.h,v 1.2 94/04/05 15:14:19 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/geometry/pc101-NG b/xc/programs/xkbcomp/geometry/pc101-NG
index 507d69d8d..a1e68dad9 100644
--- a/xc/programs/xkbcomp/geometry/pc101-NG
+++ b/xc/programs/xkbcomp/geometry/pc101-NG
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: pc101-NG,v 1.2 94/04/08 15:56:05 erik Exp $
xkb_geometry "pc101-NG"
description= "Omnikey 101"
diff --git a/xc/programs/xkbcomp/indicators.c b/xc/programs/xkbcomp/indicators.c
index e255bcbd1..b4700e0da 100644
--- a/xc/programs/xkbcomp/indicators.c
+++ b/xc/programs/xkbcomp/indicators.c
@@ -1,4 +1,4 @@
-/* $XConsortium: indicators.c,v 1.2 94/04/04 15:28:08 rws Exp $ */
+/* $XConsortium: indicators.c,v 1.1 94/04/08 15:31:39 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/indicators.h b/xc/programs/xkbcomp/indicators.h
index fb1a94a0c..3c0a57245 100644
--- a/xc/programs/xkbcomp/indicators.h
+++ b/xc/programs/xkbcomp/indicators.h
@@ -1,4 +1,4 @@
-/* $XConsortium: indicators.h,v 1.2 94/04/04 15:28:08 rws Exp $ */
+/* $XConsortium: indicators.h,v 1.1 94/04/08 15:31:47 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/keycodes.c b/xc/programs/xkbcomp/keycodes.c
index db0379dac..b23fe9acf 100644
--- a/xc/programs/xkbcomp/keycodes.c
+++ b/xc/programs/xkbcomp/keycodes.c
@@ -1,4 +1,4 @@
-/* $XConsortium: keycodes.c,v 1.2 94/04/04 15:28:18 rws Exp $ */
+/* $XConsortium: keycodes.c,v 1.3 94/04/08 15:27:17 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/keycodes.h b/xc/programs/xkbcomp/keycodes.h
index 80b8e9d90..eb5e0ae4e 100644
--- a/xc/programs/xkbcomp/keycodes.h
+++ b/xc/programs/xkbcomp/keycodes.h
@@ -1,4 +1,4 @@
-/* $XConsortium: keycodes.h,v 1.1 94/04/02 17:06:16 erik Exp $ */
+/* $XConsortium: keycodes.h,v 1.2 94/04/04 15:28:21 rws Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/keycodes/ibmpc b/xc/programs/xkbcomp/keycodes/ibmpc
index 33078590e..b08bf3e05 100644
--- a/xc/programs/xkbcomp/keycodes/ibmpc
+++ b/xc/programs/xkbcomp/keycodes/ibmpc
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: ibmpc,v 1.2 94/04/08 15:56:44 erik Exp $
xkb_keycodes "ibmpc"
minimum= 15;
diff --git a/xc/programs/xkbcomp/keycodes/sgi b/xc/programs/xkbcomp/keycodes/sgi
index b69a7bdd6..2d598db8a 100644
--- a/xc/programs/xkbcomp/keycodes/sgi
+++ b/xc/programs/xkbcomp/keycodes/sgi
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: sgi,v 1.2 94/04/08 15:56:44 erik Exp $
xkb_keycodes "sgi"
minimum= 10;
diff --git a/xc/programs/xkbcomp/keymap.c b/xc/programs/xkbcomp/keymap.c
index 3a01e3280..95c907b6c 100644
--- a/xc/programs/xkbcomp/keymap.c
+++ b/xc/programs/xkbcomp/keymap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: keymap.c,v 1.1 94/04/02 17:06:22 erik Exp $ */
+/* $XConsortium: keymap.c,v 1.2 94/04/08 15:26:16 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/keymap/us102_ibmpc b/xc/programs/xkbcomp/keymap/us102_ibmpc
index 624193a46..48be733af 100644
--- a/xc/programs/xkbcomp/keymap/us102_ibmpc
+++ b/xc/programs/xkbcomp/keymap/us102_ibmpc
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: us102_ibmpc,v 1.2 94/04/08 15:57:21 erik Exp $
xkb_keymap "ibmpc default"
xkb_keycodes { include "ibmpc" };
diff --git a/xc/programs/xkbcomp/keymap/us102_sgi b/xc/programs/xkbcomp/keymap/us102_sgi
index b6dee8ce3..a6dc9abcd 100644
--- a/xc/programs/xkbcomp/keymap/us102_sgi
+++ b/xc/programs/xkbcomp/keymap/us102_sgi
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: us102_sgi,v 1.3 94/04/08 15:57:21 erik Exp $
xkb_keymap "sgi default"
xkb_keycodes { include "sgi" };
diff --git a/xc/programs/xkbcomp/keytypes.c b/xc/programs/xkbcomp/keytypes.c
index db8c5e702..16661a8f7 100644
--- a/xc/programs/xkbcomp/keytypes.c
+++ b/xc/programs/xkbcomp/keytypes.c
@@ -1,4 +1,4 @@
-/* $XConsortium: keytypes.c,v 1.2 94/04/04 15:28:24 rws Exp $ */
+/* $XConsortium: keytypes.c,v 1.4 94/04/08 15:28:14 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/misc.c b/xc/programs/xkbcomp/misc.c
index 4d63731ab..807260da1 100644
--- a/xc/programs/xkbcomp/misc.c
+++ b/xc/programs/xkbcomp/misc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: misc.c,v 1.1 94/04/02 17:07:20 erik Exp $ */
+/* $XConsortium: misc.c,v 1.2 94/04/08 15:27:32 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/misc.h b/xc/programs/xkbcomp/misc.h
index 71b771f28..b4b5f88ef 100644
--- a/xc/programs/xkbcomp/misc.h
+++ b/xc/programs/xkbcomp/misc.h
@@ -1,4 +1,4 @@
-/* $XConsortium: misc.h,v 1.1 94/04/02 17:07:31 erik Exp $ */
+/* $XConsortium: misc.h,v 1.2 94/04/08 15:28:36 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/semantics/basic b/xc/programs/xkbcomp/semantics/basic
index a5fcaa667..49003d5ea 100644
--- a/xc/programs/xkbcomp/semantics/basic
+++ b/xc/programs/xkbcomp/semantics/basic
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: basic,v 1.2 94/04/08 15:58:33 erik Exp $
xkb_semantics "basic"
xkb_types { include "basic" };
diff --git a/xc/programs/xkbcomp/semantics/complete b/xc/programs/xkbcomp/semantics/complete
index ee2d6c87e..40f754c36 100644
--- a/xc/programs/xkbcomp/semantics/complete
+++ b/xc/programs/xkbcomp/semantics/complete
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: complete,v 1.2 94/04/08 15:58:33 erik Exp $
xkb_semantics "complete"
xkb_types { include "complete" };
diff --git a/xc/programs/xkbcomp/semantics/default b/xc/programs/xkbcomp/semantics/default
index 31df18608..96fa1ef05 100644
--- a/xc/programs/xkbcomp/semantics/default
+++ b/xc/programs/xkbcomp/semantics/default
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: default,v 1.3 94/04/08 15:58:33 erik Exp $
xkb_semantics "default"
xkb_types { include "default" };
diff --git a/xc/programs/xkbcomp/symbols.c b/xc/programs/xkbcomp/symbols.c
index 4d62d9fe7..ceb06b7f7 100644
--- a/xc/programs/xkbcomp/symbols.c
+++ b/xc/programs/xkbcomp/symbols.c
@@ -1,4 +1,4 @@
-/* $XConsortium: symbols.c,v 1.2 94/04/04 15:28:31 rws Exp $ */
+/* $XConsortium: symbols.c,v 1.4 94/04/08 15:29:04 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/symbols/en_US b/xc/programs/xkbcomp/symbols/en_US
index 18bd79bbe..0da81c166 100644
--- a/xc/programs/xkbcomp/symbols/en_US
+++ b/xc/programs/xkbcomp/symbols/en_US
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: en_US,v 1.2 94/04/08 15:59:37 erik Exp $
xkb_symbols
include "us"
include "iso9995-3"
diff --git a/xc/programs/xkbcomp/symbols/iso9995-3 b/xc/programs/xkbcomp/symbols/iso9995-3
index c7e7e7f4c..1dcdd69fb 100644
--- a/xc/programs/xkbcomp/symbols/iso9995-3
+++ b/xc/programs/xkbcomp/symbols/iso9995-3
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: iso9995-3,v 1.2 94/04/08 15:59:37 erik Exp $
xkb_symbols "iso9995-3"
// Part 3 of ISO9995 specifies a common alternate character set
diff --git a/xc/programs/xkbcomp/symbols/iso9995-full b/xc/programs/xkbcomp/symbols/iso9995-full
index 9f3493790..4822aac08 100644
--- a/xc/programs/xkbcomp/symbols/iso9995-full
+++ b/xc/programs/xkbcomp/symbols/iso9995-full
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: iso9995-full,v 1.2 94/04/08 15:59:37 erik Exp $
xkb_symbols "iso9995-full"
// Defines the special modifier keys specified by 9995 part 3
diff --git a/xc/programs/xkbcomp/symbols/us b/xc/programs/xkbcomp/symbols/us
index 9e4541805..9d76f2a3c 100644
--- a/xc/programs/xkbcomp/symbols/us
+++ b/xc/programs/xkbcomp/symbols/us
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: us,v 1.2 94/04/08 15:59:37 erik Exp $
xkb_symbols "us"
//description= "simple US keyboard";
diff --git a/xc/programs/xkbcomp/tokens.h b/xc/programs/xkbcomp/tokens.h
index c993df330..76f657e25 100644
--- a/xc/programs/xkbcomp/tokens.h
+++ b/xc/programs/xkbcomp/tokens.h
@@ -1,4 +1,4 @@
-/* $XConsortium: tokens.h,v 1.4 93/09/28 20:16:45 rws Exp $ */
+/* $XConsortium: tokens.h,v 1.1 94/04/02 17:07:48 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/types/basic b/xc/programs/xkbcomp/types/basic
index 38c17d72b..a5cf4812d 100644
--- a/xc/programs/xkbcomp/types/basic
+++ b/xc/programs/xkbcomp/types/basic
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: basic,v 1.3 94/04/08 16:00:43 erik Exp $
xkb_types "Common"
virtual_modifiers NumLock;
diff --git a/xc/programs/xkbcomp/types/cancel b/xc/programs/xkbcomp/types/cancel
index 740eb27bd..33948ab15 100644
--- a/xc/programs/xkbcomp/types/cancel
+++ b/xc/programs/xkbcomp/types/cancel
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: cancel,v 1.2 94/04/08 16:00:43 erik Exp $
xkb_types "Shift_Cancels_Caps"
override type "TWO_LEVEL" {
diff --git a/xc/programs/xkbcomp/types/complete b/xc/programs/xkbcomp/types/complete
index 74bb3a2a0..f4f88024c 100644
--- a/xc/programs/xkbcomp/types/complete
+++ b/xc/programs/xkbcomp/types/complete
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: complete,v 1.2 94/04/08 16:00:44 erik Exp $
xkb_types "complete"
include "basic"
diff --git a/xc/programs/xkbcomp/types/default b/xc/programs/xkbcomp/types/default
index affbca344..8b25ff8a8 100644
--- a/xc/programs/xkbcomp/types/default
+++ b/xc/programs/xkbcomp/types/default
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: default,v 1.2 94/04/08 16:00:44 erik Exp $
xkb_types "default"
include "basic"
diff --git a/xc/programs/xkbcomp/types/ibmpc b/xc/programs/xkbcomp/types/ibmpc
index bb1240c95..c2e5de330 100644
--- a/xc/programs/xkbcomp/types/ibmpc
+++ b/xc/programs/xkbcomp/types/ibmpc
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: ibmpc,v 1.2 94/04/08 16:00:44 erik Exp $
xkb_types "Common IBM/PC Keys"
type "PC_BREAK" {
diff --git a/xc/programs/xkbcomp/types/iso9995 b/xc/programs/xkbcomp/types/iso9995
index 418e23886..5b8760562 100644
--- a/xc/programs/xkbcomp/types/iso9995
+++ b/xc/programs/xkbcomp/types/iso9995
@@ -1,4 +1,4 @@
-// $XConsortium: basic,v 1.3 94/04/08 15:54:51 erik Exp $
+// $XConsortium: iso9995,v 1.2 94/04/08 16:00:44 erik Exp $
xkb_types "iso9995 keys"
virtual_modifiers LevelThree;
diff --git a/xc/programs/xkbcomp/utils/Imakefile b/xc/programs/xkbcomp/utils/Imakefile
index 2a848ab73..6b619dc68 100644
--- a/xc/programs/xkbcomp/utils/Imakefile
+++ b/xc/programs/xkbcomp/utils/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.2 94/04/05 22:01:37 rws Exp $
SRCS = storage.c hash.c strtbl.c utils.c
OBJS = storage.o hash.o strtbl.o utils.o
diff --git a/xc/programs/xkbcomp/utils/hash.c b/xc/programs/xkbcomp/utils/hash.c
index a9a1268d3..50d8d45e7 100644
--- a/xc/programs/xkbcomp/utils/hash.c
+++ b/xc/programs/xkbcomp/utils/hash.c
@@ -1,6 +1,6 @@
/*\
- * $XConsortium: xkmformat.h,v 1.4 93/09/28 20:16:45 rws Exp $
+ * $XConsortium: hash.c,v 1.1 94/04/02 17:10:26 erik Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/hash.h b/xc/programs/xkbcomp/utils/hash.h
index 3832574ab..23ecdf476 100644
--- a/xc/programs/xkbcomp/utils/hash.h
+++ b/xc/programs/xkbcomp/utils/hash.h
@@ -6,7 +6,7 @@
_XFUNCPROTOBEGIN
/*\
- * $XConsortium: hash.h,v 1.1 94/04/02 17:10:37 erik Exp $
+ * $XConsortium: hash.h,v 1.2 94/04/04 15:31:20 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/hashstr.h b/xc/programs/xkbcomp/utils/hashstr.h
index 3b002c46e..75dd46de9 100644
--- a/xc/programs/xkbcomp/utils/hashstr.h
+++ b/xc/programs/xkbcomp/utils/hashstr.h
@@ -6,7 +6,7 @@
_XFUNCPROTOBEGIN
/*\
- * $XConsortium: hashstr.h,v 1.1 94/04/02 17:10:45 erik Exp $
+ * $XConsortium: hashstr.h,v 1.2 94/04/04 15:31:22 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/storage.c b/xc/programs/xkbcomp/utils/storage.c
index 0d968f5fc..2eff1e9d4 100644
--- a/xc/programs/xkbcomp/utils/storage.c
+++ b/xc/programs/xkbcomp/utils/storage.c
@@ -1,6 +1,6 @@
/*\
- * $XConsortium: storage.c,v 1.1 94/04/02 17:10:50 erik Exp $
+ * $XConsortium: storage.c,v 1.2 94/04/04 15:31:27 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/storage.h b/xc/programs/xkbcomp/utils/storage.h
index fd3ed7efd..b3586b3cb 100644
--- a/xc/programs/xkbcomp/utils/storage.h
+++ b/xc/programs/xkbcomp/utils/storage.h
@@ -6,7 +6,7 @@
_XFUNCPROTOBEGIN
/*\
- * $XConsortium: storage.h,v 1.1 94/04/02 17:11:18 erik Exp $
+ * $XConsortium: storage.h,v 1.2 94/04/04 15:31:30 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/storagestr.h b/xc/programs/xkbcomp/utils/storagestr.h
index a46c638c6..d0f24c0c4 100644
--- a/xc/programs/xkbcomp/utils/storagestr.h
+++ b/xc/programs/xkbcomp/utils/storagestr.h
@@ -6,7 +6,7 @@
_XFUNCPROTOBEGIN
/*\
- * $XConsortium: storagestr.h,v 1.1 94/04/02 17:11:27 erik Exp $
+ * $XConsortium: storagestr.h,v 1.2 94/04/04 15:31:33 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/strtbl.c b/xc/programs/xkbcomp/utils/strtbl.c
index e056c5cda..65ff928a2 100644
--- a/xc/programs/xkbcomp/utils/strtbl.c
+++ b/xc/programs/xkbcomp/utils/strtbl.c
@@ -1,6 +1,6 @@
/*\
- * $XConsortium: strtbl.c,v 1.1 94/04/02 17:11:33 erik Exp $
+ * $XConsortium: strtbl.c,v 1.2 94/04/04 15:31:35 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/strtbl.h b/xc/programs/xkbcomp/utils/strtbl.h
index 373f71894..a67d95066 100644
--- a/xc/programs/xkbcomp/utils/strtbl.h
+++ b/xc/programs/xkbcomp/utils/strtbl.h
@@ -6,7 +6,7 @@
_XFUNCPROTOBEGIN
/*\
- * $XConsortium: strtbl.h,v 1.1 94/04/02 17:11:54 erik Exp $
+ * $XConsortium: strtbl.h,v 1.2 94/04/04 15:31:38 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/strtblstr.h b/xc/programs/xkbcomp/utils/strtblstr.h
index 000ce74f1..0422f7faa 100644
--- a/xc/programs/xkbcomp/utils/strtblstr.h
+++ b/xc/programs/xkbcomp/utils/strtblstr.h
@@ -6,7 +6,7 @@
_XFUNCPROTOBEGIN
/*\
- * $XConsortium: strtblstr.h,v 1.1 94/04/02 17:11:59 erik Exp $
+ * $XConsortium: strtblstr.h,v 1.2 94/04/04 15:31:40 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/utils.c b/xc/programs/xkbcomp/utils/utils.c
index 646a615ee..d495c7a45 100644
--- a/xc/programs/xkbcomp/utils/utils.c
+++ b/xc/programs/xkbcomp/utils/utils.c
@@ -1,6 +1,6 @@
/*\
- * $XConsortium: utils.c,v 1.2 94/04/04 15:31:43 rws Exp $
+ * $XConsortium: utils.c,v 1.3 94/04/05 15:13:12 erik Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/utils/utils.h b/xc/programs/xkbcomp/utils/utils.h
index 8dddecc21..62440bfad 100644
--- a/xc/programs/xkbcomp/utils/utils.h
+++ b/xc/programs/xkbcomp/utils/utils.h
@@ -2,7 +2,7 @@
#define UTILS_H 1
/*\
- * $XConsortium: utils.h,v 1.1 94/04/02 17:12:17 erik Exp $
+ * $XConsortium: utils.h,v 1.2 94/04/04 15:31:47 rws Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xkbcomp/vmod.c b/xc/programs/xkbcomp/vmod.c
index b6540a671..b7953353b 100644
--- a/xc/programs/xkbcomp/vmod.c
+++ b/xc/programs/xkbcomp/vmod.c
@@ -1,4 +1,4 @@
-/* $XConsortium: vmod.c,v 1.2 94/04/04 15:28:35 rws Exp $ */
+/* $XConsortium: vmod.c,v 1.3 94/04/08 15:25:30 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/vmod.h b/xc/programs/xkbcomp/vmod.h
index 9f8763374..bd3b8dcb1 100644
--- a/xc/programs/xkbcomp/vmod.h
+++ b/xc/programs/xkbcomp/vmod.h
@@ -1,4 +1,4 @@
-/* $XConsortium: vmod.h,v 1.1 94/04/02 17:08:10 erik Exp $ */
+/* $XConsortium: vmod.h,v 1.2 94/04/08 15:25:42 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbcomp.c b/xc/programs/xkbcomp/xkbcomp.c
index a5b806ca4..ad0db967f 100644
--- a/xc/programs/xkbcomp/xkbcomp.c
+++ b/xc/programs/xkbcomp/xkbcomp.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbcomp.c,v 1.2 94/04/04 15:28:38 rws Exp $ */
+/* $XConsortium: xkbcomp.c,v 1.3 94/04/08 15:29:47 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbcomp.h b/xc/programs/xkbcomp/xkbcomp.h
index 3ad3080ce..dc28e8521 100644
--- a/xc/programs/xkbcomp/xkbcomp.h
+++ b/xc/programs/xkbcomp/xkbcomp.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbcomp.h,v 1.3 94/04/04 10:39:01 rws Exp $ */
+/* $XConsortium: xkbcomp.h,v 1.4 94/04/08 15:30:05 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbcomp.man b/xc/programs/xkbcomp/xkbcomp.man
index 61c7eb54a..b72518ef4 100644
--- a/xc/programs/xkbcomp/xkbcomp.man
+++ b/xc/programs/xkbcomp/xkbcomp.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xkbcomp.man,v 1.1 93/08/02 11:12:57 erik Exp $
+.\" $XConsortium: xkbcomp.man,v 1.1 94/04/11 11:54:29 erik Exp $
.TH XKBCOMP 1 "Release 6" "X Version 11"
.SH NAME
xkbcomp \- compile XKB keyboard description
diff --git a/xc/programs/xkbcomp/xkbfile/Imakefile b/xc/programs/xkbcomp/xkbfile/Imakefile
index 115d2cfcf..5523fa2ef 100644
--- a/xc/programs/xkbcomp/xkbfile/Imakefile
+++ b/xc/programs/xkbcomp/xkbfile/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.2 94/04/05 22:01:37 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.2 94/04/08 15:52:10 erik Exp $
SRCS = xkbpath.c xkbtext.c xkbatom.c \
cout.c xkbout.c xkmout.c \
xkmread.c
diff --git a/xc/programs/xkbcomp/xkbfile/cout.c b/xc/programs/xkbcomp/xkbfile/cout.c
index cb1e32f10..c4d7e2ff4 100644
--- a/xc/programs/xkbcomp/xkbfile/cout.c
+++ b/xc/programs/xkbcomp/xkbfile/cout.c
@@ -1,4 +1,4 @@
-/* $XConsortium: cout.c,v 1.2 94/04/04 15:28:12 rws Exp $ */
+/* $XConsortium: cout.c,v 1.1 94/04/08 15:46:53 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkbatom.c b/xc/programs/xkbcomp/xkbfile/xkbatom.c
index f14892f9f..7e3938f0c 100644
--- a/xc/programs/xkbcomp/xkbfile/xkbatom.c
+++ b/xc/programs/xkbcomp/xkbfile/xkbatom.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbatom.c,v 1.2 94/04/04 15:28:12 rws Exp $ */
+/* $XConsortium: xkbatom.c,v 1.1 94/04/08 15:47:49 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkbfile.h b/xc/programs/xkbcomp/xkbfile/xkbfile.h
index e880af367..fe92be1ff 100644
--- a/xc/programs/xkbcomp/xkbfile/xkbfile.h
+++ b/xc/programs/xkbcomp/xkbfile/xkbfile.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbio.h,v 1.1 94/04/02 17:08:55 erik Exp $ */
+/* $XConsortium: xkbfile.h,v 1.1 94/04/08 15:48:50 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkbout.c b/xc/programs/xkbcomp/xkbfile/xkbout.c
index 2721182d1..fcf80b20a 100644
--- a/xc/programs/xkbcomp/xkbfile/xkbout.c
+++ b/xc/programs/xkbcomp/xkbfile/xkbout.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbout.c,v 1.2 94/04/04 15:28:43 rws Exp $ */
+/* $XConsortium: xkbout.c,v 1.1 94/04/08 15:49:02 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkbpath.c b/xc/programs/xkbcomp/xkbfile/xkbpath.c
index 7fb24369d..571f12d02 100644
--- a/xc/programs/xkbcomp/xkbfile/xkbpath.c
+++ b/xc/programs/xkbcomp/xkbfile/xkbpath.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbio.c,v 1.2 94/04/04 15:28:41 rws Exp $ */
+/* $XConsortium: xkbpath.c,v 1.1 94/04/08 15:49:55 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkbtext.c b/xc/programs/xkbcomp/xkbfile/xkbtext.c
index b7986c930..91f7f52a1 100644
--- a/xc/programs/xkbcomp/xkbfile/xkbtext.c
+++ b/xc/programs/xkbcomp/xkbfile/xkbtext.c
@@ -1,4 +1,4 @@
-/* $XConsortium: text.c,v 1.2 94/04/04 15:28:12 rws Exp $ */
+/* $XConsortium: xkbtext.c,v 1.1 94/04/08 15:50:11 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkmout.c b/xc/programs/xkbcomp/xkbfile/xkmout.c
index c9afa206b..9ed301b95 100644
--- a/xc/programs/xkbcomp/xkbfile/xkmout.c
+++ b/xc/programs/xkbcomp/xkbfile/xkmout.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkmout.c,v 1.4 93/09/28 20:16:45 rws Exp $ */
+/* $XConsortium: xkmout.c,v 1.1 94/04/08 15:50:38 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbfile/xkmread.c b/xc/programs/xkbcomp/xkbfile/xkmread.c
index fc43dc815..f002033d5 100644
--- a/xc/programs/xkbcomp/xkbfile/xkmread.c
+++ b/xc/programs/xkbcomp/xkbfile/xkmread.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkmread.c,v 1.1 94/04/08 15:51:02 erik Exp $ */
+/* $XConsortium: xkmread.c,v 1.2 94/04/09 12:41:41 rws Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbio.c b/xc/programs/xkbcomp/xkbio.c
deleted file mode 100644
index b434f4279..000000000
--- a/xc/programs/xkbcomp/xkbio.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* $XConsortium: xkbio.c,v 1.1 94/04/02 17:08:45 erik Exp $ */
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- 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.
-
- ********************************************************/
-
-#include <X11/Xlib.h>
-
-#define DEBUG_VAR_NOT_LOCAL
-#define DEBUG_VAR debugFlags
-#include "utils.h"
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#endif
-
-#ifndef DFLT_XKB_CONFIG_ROOT
-#define DFLT_XKB_CONFIG_ROOT "/usr/lib/X11/xkb"
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-#define PATH_CHUNK 8
-
-static int longestPath;
-static int szPath;
-static int nPathEntries;
-static char ** includePath;
-
-Bool
-InitIncludePath()
-{
- szPath= PATH_CHUNK;
- includePath= uTypedCalloc(szPath,char *);
- if (includePath==NULL)
- return False;
- AddDirectoryToPath(".");
- AddDirectoryToPath(DFLT_XKB_CONFIG_ROOT);
-}
-
-void
-ClearIncludePath()
-{
-register int i;
-
- if (szPath>0) {
- for (i=0;i<nPathEntries;i++) {
- if (includePath[i]!=NULL) {
- uFree(includePath[i]);
- includePath[i]= NULL;
- }
- }
- nPathEntries= 0;
- longestPath= 0;
- }
- return;
-}
-
-Bool
-AddDirectoryToPath(dir)
- char *dir;
-{
-int len;
- if ((dir==NULL)||(dir[0]=='\0')) {
- ClearIncludePath();
- return True;
- }
- len= strlen(dir);
- if (len+2>=PATH_MAX) { /* allow for '/' and at least one character */
- uError("Path entry (%s) too long (maxiumum length is %d)\n",
- dir,PATH_MAX-3);
- return False;
- }
- if (len>longestPath)
- longestPath= len;
- if (nPathEntries>=szPath) {
- szPath+= PATH_CHUNK;
- includePath= uTypedRealloc(includePath,szPath,char *);
- if (includePath==NULL) {
- uInternalError("Allocation failed (includePath)\n");
- return False;
- }
- }
- includePath[nPathEntries]= uTypedCalloc(strlen(dir)+1,char);
- if (includePath[nPathEntries]==NULL) {
- uInternalError("Allocation failed (includePath[%d])\n",nPathEntries);
- return False;
- }
- strcpy(includePath[nPathEntries++],dir);
- return True;
-}
-
-FILE *
-FindFileInPath(name,type,pathRtrn)
- char * name;
- char * type;
- char ** pathRtrn;
-{
-register int i;
-FILE *file;
-int nameLen,typeLen,pathLen;
-char buf[PATH_MAX];
-
- nameLen= strlen(name);
- typeLen= strlen(type);
- for (i=0;i<nPathEntries;i++) {
- pathLen= strlen(includePath[i]);
- if ((nameLen+pathLen+1)>=PATH_MAX) {
- uError("File name (%s/%s) too long\n",includePath[i],name);
- uAction("Ignored\n");
- continue;
- }
- sprintf(buf,"%s/%s",includePath[i],name);
- file= fopen(buf,"r");
- if (file!=NULL)
- break;
- else if (typeLen<1)
- continue;
-
- if ((nameLen+typeLen+pathLen+2)>=PATH_MAX) {
- uError("File name (%s/%s/%s) too long\n",includePath[i],type,name);
- uAction("Ignored\n");
- continue;
- }
- sprintf(buf,"%s/%s/%s",includePath[i],type,name);
- file= fopen(buf,"r");
- if (file!=NULL)
- break;
- }
-
- if ((file!=NULL)&&(pathRtrn!=NULL)) {
- *pathRtrn= uTypedCalloc(strlen(buf)+1,char);
- if (*pathRtrn!=NULL)
- strcpy(*pathRtrn,buf);
- }
- return file;
-}
-
diff --git a/xc/programs/xkbcomp/xkbio.h b/xc/programs/xkbcomp/xkbio.h
deleted file mode 100644
index 4cea58db4..000000000
--- a/xc/programs/xkbcomp/xkbio.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $XConsortium: xkbio.h,v 1.4 93/09/28 20:16:45 rws Exp $ */
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- 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.
-
- ********************************************************/
-
-#ifndef XKBIO_H
-#define XKBIO_H 1
-
-extern Bool InitIncludePath(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
-extern void ClearIncludePath(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
-extern Bool AddDirectoryToPath(
-#if NeedFunctionPrototypes
- char * /* dir */
-#endif
-);
-
-extern FILE *FindFileInPath(
-#if NeedFunctionPrototypes
- char * /* name */,
- char * /* type */,
- char ** /* pathRtrn */
-#endif
-);
-
-#endif /* XKBIO_H */
diff --git a/xc/programs/xkbcomp/xkbout.c b/xc/programs/xkbcomp/xkbout.c
deleted file mode 100644
index 8589fd6f9..000000000
--- a/xc/programs/xkbcomp/xkbout.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/* $XConsortium: xkbout.c,v 1.2 94/04/04 15:28:43 rws Exp $ */
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- 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.
-
- ********************************************************/
-
-
-#define DEBUG_VAR_NOT_LOCAL
-#define DEBUG_VAR debugFlags
-#include "xkbcomp.h"
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#endif
-#include "misc.h"
-#include "tokens.h"
-
-#include <X11/extensions/XKB.h>
-#include <X11/XKBlib.h>
-#include "expr.h"
-#include "vmod.h"
-
-static char *
-VModText(xkb,vmod)
- XkbDescPtr xkb;
- unsigned vmod;
-{
-static char buf[8];
-
- if (vmod>=XkbNumVirtualMods) {
- sprintf(buf,"ILLEGAL");
- }
- else if ((xkb!=NULL)&&(xkb->names!=NULL)&&
- (((StringToken)xkb->names->vmods[vmod])!=NullStringToken)) {
- return stGetString(((StringToken)xkb->names->vmods[vmod]));
- }
- sprintf(buf,"%d",vmod);
- return buf;
-}
-
-static Bool
-WriteXKBVModDecl(file,xkb)
- FILE * file;
- XkbDescPtr xkb;
-{
-register int i,nMods;
-StringToken * vmodNames;
-unsigned char * vmodDefs;
-
- if (xkb==NULL)
- return False;
- if (xkb->names!=NULL)
- vmodNames= (StringToken *)xkb->names->vmods;
- else vmodNames= NULL;
- if (xkb->server!=NULL)
- vmodDefs= xkb->server->vmods;
- else vmodDefs= NULL;
-
- for (i=nMods=0;i<XkbNumVirtualMods;i++) {
- if ((vmodNames!=NULL)&&(vmodNames[i]!=NullStringToken)) {
- if (nMods==0) fprintf(file,"virtual_modifiers ");
- else fprintf(file,",");
- fprintf(file,"%s",stGetString(vmodNames[i]));
- if ((vmodDefs!=NULL)&&(vmodDefs[i]!=XkbNoModifier))
- fprintf(file,"=%s",modIndexText(vmodDefs[i],XkbXKBFile));
- nMods++;
- }
- }
- if (nMods>0)
- fprintf(file,";\n\n");
-}
-
-/***====================================================================***/
-
-static Bool
-PrintNoActionArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
- return True;
-}
-
-static Bool
-PrintModActionArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbModAction * act;
-unsigned tmp;
-char * str;
-
- act= (XkbModAction *)action;
- tmp= XkbModActionVMods(act);
- fprintf(file,"modifiers=");
- if (act->flags&XkbSA_UseModMapMods)
- fprintf(file,"modMapMods");
- else if (act->real_mods || tmp) {
- if (act->real_mods)
- fprintf(file,"%s%s",modMaskText(act->real_mods,XkbXKBFile),
- (tmp?"+":""));
- if (tmp)
- fprintf(file,"%s",vmodMaskText(xkb,0,tmp,XkbXKBFile));
- }
- else fprintf(file,"none");
- if (action->type==XkbSA_LockMods)
- return True;
- if (act->flags&XkbSA_ClearLocks)
- fprintf(file,",clearLocks");
- if (act->flags&XkbSA_LatchToLock)
- fprintf(file,",latchToLock");
- return True;
-}
-
-static Bool
-PrintGroupActionArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbGroupAction * act;
-unsigned tmp;
-
- act= (XkbGroupAction *)action;
- fprintf(file,"group=");
- if (act->flags&XkbSA_GroupAbsolute)
- fprintf(file,"%d",XkbSAGroup(act)+1);
- else if (XkbSAGroup(act)<0)
- fprintf(file,"%d",XkbSAGroup(act));
- else fprintf(file,"+%d",XkbSAGroup(act));
- if (action->type==XkbSA_LockGroup)
- return True;
- if (act->flags&XkbSA_ClearLocks)
- fprintf(file,",clearLocks");
- if (act->flags&XkbSA_LatchToLock)
- fprintf(file,",latchToLock");
- return True;
-}
-
-static Bool
-PrintMoveAccelPtrArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbPtrAction * act;
-int x,y;
-
- act= (XkbPtrAction *)action;
- x= XkbPtrActionX(act);
- y= XkbPtrActionY(act);
- fprintf(file,"x=%d,y=%d",x,y);
- return True;
-}
-
-static Bool
-PrintPtrBtnArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbPtrBtnAction * act;
-
- act= (XkbPtrBtnAction *)action;
- fprintf(file,"button=");
- if ((act->button>0)&&(act->button<6))
- fprintf(file,"%d",act->button);
- else fprintf(file,"default");
- if (action->type==XkbSA_ClickPtrBtn) {
- fprintf(file,",count=%d",act->count);
- }
- return True;
-}
-
-static Bool
-PrintSetPtrDfltArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbPtrDfltAction * act;
-
- act= (XkbPtrDfltAction *)action;
- if (act->affect==XkbSA_AffectDfltBtn) {
- fprintf(file,"affect=button,button=");
- if ((act->flags&XkbSA_DfltBtnAbsolute)||(XkbSAPtrDfltValue(act)<0))
- fprintf(file,"%d",XkbSAPtrDfltValue(act));
- else fprintf(file,"+%d",XkbSAPtrDfltValue(act));
- }
- return True;
-}
-
-static Bool
-PrintISOLockArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbISOAction * act;
-
- act= (XkbISOAction *)action;
- if (act->flags&XkbSA_ISODfltIsGroup) {
- fprintf(file,"group=");
- if (act->flags&XkbSA_GroupAbsolute)
- fprintf(file,"%d",XkbSAGroup(act)+1);
- else if (XkbSAGroup(act)<0)
- fprintf(file,"%d",XkbSAGroup(act));
- else fprintf(file,"+%d",XkbSAGroup(act));
- }
- else {
- unsigned tmp;
- tmp= XkbModActionVMods(act);
- fprintf(file,"modifiers=");
- if (act->flags&XkbSA_UseModMapMods)
- fprintf(file,"modMapMods");
- else if (act->real_mods || tmp) {
- if (act->real_mods)
- fprintf(file,"%s%s",modMaskText(act->real_mods,XkbXKBFile),
- (tmp?"+":""));
- if (tmp)
- fprintf(file,"%s",vmodMaskText(xkb,0,tmp,XkbXKBFile));
- }
- else fprintf(file,"none");
- }
- fprintf(file,",affect=");
- if ((act->affect&XkbSA_ISOAffectMask)==0)
- fprintf(file,"all");
- else {
- int nOut= 0;
- if ((act->affect&XkbSA_ISONoAffectMods)==0) {
- fprintf(file,"mods");
- nOut++;
- }
- if ((act->affect&XkbSA_ISONoAffectGroup)==0) {
- fprintf(file,"%sgroups",(nOut>0?"+":""));
- nOut++;
- }
- if ((act->affect&XkbSA_ISONoAffectPtr)==0) {
- fprintf(file,"%spointer",(nOut>0?"+":""));
- nOut++;
- }
- if ((act->affect&XkbSA_ISONoAffectCtrls)==0) {
- fprintf(file,"%scontrols",(nOut>0?"+":""));
- nOut++;
- }
- }
- return True;
-}
-
-static Bool
-PrintSwitchScreenArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbSwitchScreenAction * act;
-
- act= (XkbSwitchScreenAction *)action;
- if ((act->flags&XkbSA_SwitchAbsolute)||(XkbSAScreen(act)<0))
- fprintf(file,"screen=%d",XkbSAScreen(act));
- else fprintf(file,"screen=+%d",XkbSAScreen(act));
- if (act->flags&XkbSA_SwitchApplication)
- fprintf(file,",!same");
- else fprintf(file,",same");
- return True;
-}
-
-static Bool
-PrintSetLockControlsArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-XkbCtrlsAction * act;
-unsigned tmp;
-
- act= (XkbCtrlsAction *)action;
- tmp= XkbActionCtrls(act);
- fprintf(file,"controls=");
- if (tmp==0)
- fprintf(file,"none");
- else if ((tmp&XkbAllAccessXMask)==XkbAllAccessXMask)
- fprintf(file,"all");
- else {
- int nOut= 0;
- if (tmp&XkbRepeatKeysMask) {
- fprintf(file,"%sRepeatKeys",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbSlowKeysMask) {
- fprintf(file,"%sSlowKeys",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbBounceKeysMask) {
- fprintf(file,"%sBounceKeys",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbStickyKeysMask) {
- fprintf(file,"%sStickyKeys",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbMouseKeysMask) {
- fprintf(file,"%sMouseKeys",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbMouseKeysAccelMask) {
- fprintf(file,"%sMouseKeysAccel",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbAccessXKeysMask) {
- fprintf(file,"%sAccessXKeys",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbAccessXTimeoutMask) {
- fprintf(file,"%sAccessXTimeout",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbAccessXFeedbackMask) {
- fprintf(file,"%sAccessXFeedback",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbGroupsWrapMask) {
- fprintf(file,"%sGroupsWrap",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbAudibleBellMask) {
- fprintf(file,"%sAudibleBell",(nOut>0?"+":""));
- nOut++;
- }
- if (tmp&XkbAutoAutorepeatMask) {
- fprintf(file,"%sAutoAutorepeat",(nOut>0?"+":""));
- nOut++;
- }
- }
- return True;
-}
-
-static Bool
-PrintActionMessageArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
-int nOut= 0;
-XkbMessageAction * act;
-unsigned all;
-
- act= (XkbMessageAction *)action;
- all= XkbSA_MessageOnPress|XkbSA_MessageOnRelease;
- fprintf(file,"report=");
- if ((act->flags&all)==0)
- fprintf(file,"none");
- else if ((act->flags&all)==all)
- fprintf(file,"all");
- else if (act->flags&XkbSA_MessageOnPress)
- fprintf(file,"KeyPress");
- else fprintf(file,"KeyRelease");
- fprintf(file,",data[0]=0x%02x",act->message[0]);
- fprintf(file,",data[1]=0x%02x",act->message[1]);
- fprintf(file,",data[2]=0x%02x",act->message[2]);
- fprintf(file,",data[3]=0x%02x",act->message[3]);
- fprintf(file,",data[4]=0x%02x",act->message[4]);
- fprintf(file,",data[5]=0x%02x",act->message[5]);
- return True;
-}
-
-static Bool
-PrintOtherArgs(file,indent,xkb,action)
- FILE * file;
- unsigned indent;
- XkbDescPtr xkb;
- XkbAnyAction * action;
-{
- fprintf(file,"type=0x%02x",action->type);
- fprintf(file,",data[0]=0x%02x",action->data[0]);
- fprintf(file,",data[1]=0x%02x",action->data[1]);
- fprintf(file,",data[2]=0x%02x",action->data[2]);
- fprintf(file,",data[3]=0x%02x",action->data[3]);
- fprintf(file,",data[4]=0x%02x",action->data[4]);
- fprintf(file,",data[5]=0x%02x",action->data[5]);
- fprintf(file,",data[6]=0x%02x",action->data[6]);
- return True;
-}
-
-typedef Bool (*actionPrint)();
-static actionPrint printActionArgs[XkbSA_NumActions] = {
- PrintNoActionArgs /* NoAction */,
- PrintModActionArgs /* SetMods */,
- PrintModActionArgs /* LatchMods */,
- PrintModActionArgs /* LockMods */,
- PrintGroupActionArgs /* SetGroup */,
- PrintGroupActionArgs /* LatchGroup */,
- PrintGroupActionArgs /* LockGroup */,
- PrintMoveAccelPtrArgs /* MovePtr */,
- PrintMoveAccelPtrArgs /* AccelPtr */,
- PrintPtrBtnArgs /* PtrBtn */,
- PrintPtrBtnArgs /* ClickPtrBtn */,
- PrintPtrBtnArgs /* LockPtrBtn */,
- PrintSetPtrDfltArgs /* SetPtrDflt */,
- PrintISOLockArgs /* ISOLock */,
- PrintNoActionArgs /* Terminate */,
- PrintSwitchScreenArgs /* SwitchScreen */,
- PrintSetLockControlsArgs /* SetControls */,
- PrintSetLockControlsArgs /* LockControls */,
- PrintActionMessageArgs /* ActionMessage*/,
-};
-
-static Bool
-WriteXKBAction(file,result,action)
- FILE * file;
- XkbFileResult * result;
- XkbAnyAction * action;
-{
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- fprintf(file,"%s(",actionTypeText(action->type,XkbXKBFile));
- if (action->type<XkbSA_NumActions)
- (*printActionArgs[action->type])(file,20,xkb,action);
- else PrintOtherArgs(file,20,xkb,action);
- fprintf(file,")");
- return True;
-}
-
-/***====================================================================***/
-
-static Bool
-WriteXKBKeycodes(file,result,topLevel)
- FILE * file;
- XkbFileResult * result;
- Bool topLevel;
-{
-StringToken kcName;
-register int i;
-char buf[8],outBuf[8];
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
- uInternalError("Key names not defined in WriteXKBKeycodes\n");
- return False;
- }
- kcName= (StringToken)xkb->names->keycodes;
- if (kcName!=NullStringToken)
- fprintf(file,"xkb_keycodes \"%s\"%s\n",stText(kcName),
- (topLevel?"":" {"));
- else fprintf(file,"xkb_keycodes%s\n",(topLevel?"":" {"));
- buf[4]= '\0';
- for (i=xkb->min_key_code;i<=xkb->max_key_code;i++) {
- memcpy(buf,xkb->names->keys[i].name,4);
- if (strlen(buf)>0) {
- sprintf(outBuf,"<%s>",buf);
- fprintf(file,"%6s = %d;\n",outBuf,i);
- }
- }
- if (!topLevel)
- fprintf(file,"};\n\n");
- return True;
-}
-
-static Bool
-WriteXKBKeyTypes(file,result,topLevel)
- FILE * file;
- XkbFileResult * result;
- Bool topLevel;
-{
-StringToken iName;
-register int i,n;
-XkbKeyTypePtr type;
-XkbKTMapEntryPtr entry;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->map)||(!xkb->map->types)) {
- uInternalError("Key types not defined in WriteXKBKeyTypes\n");
- return False;
- }
- if ((xkb->names==NULL)||(xkb->names->semantics==NullStringToken))
- fprintf(file,"xkb_types%s\n\n",(topLevel?"":" {"));
- else fprintf(file,"xkb_types \"%s\"%s\n\n",stText(xkb->names->semantics),
- (topLevel?"":" {"));
- WriteXKBVModDecl(file,xkb);
-
- type= xkb->map->types;
- for (i=0;i<xkb->map->num_types;i++,type++) {
- fprintf(file,"type \"%s\" {\n",stText((StringToken)type->name));
- fprintf(file," modifiers=%s;\n",
- vmodMaskText(xkb,type->real_mods,type->vmods,XkbXKBFile));
- entry= type->map;
- for (n=0;n<type->map_count;n++,entry++) {
- char *str;
- str=vmodMaskText(xkb,entry->real_mods,entry->vmods,XkbXKBFile);
- fprintf(file," map[%s]=%d;\n",str,entry->level+1);
- if ((type->preserve)&&((type->preserve[n].real_mods)||
- (type->preserve[n].vmods))) {
- fprintf(file," preserve[%s]= ",str);
- fprintf(file,"%s;\n",vmodMaskText(xkb,
- type->preserve[n].real_mods,
- type->preserve[n].vmods,
- XkbXKBFile));
- }
- }
- if (type->lvl_names!=NULL) {
- StringToken *name= (StringToken *)type->lvl_names;
- for (n=0;n<type->group_width;n++,name++) {
- if ((*name)==NullStringToken)
- continue;
- fprintf(file," level_name[%d]=\"%s\";\n",n+1,stText(*name));
- }
- }
- fprintf(file,"};\n");
- }
- if (!topLevel)
- fprintf(file,"};\n\n");
- return True;
-}
-
-static Bool
-WriteXKBCompatMap(file,result,topLevel)
- FILE * file;
- XkbFileResult * result;
- Bool topLevel;
-{
-StringToken iName;
-register int i;
-XkbSymInterpretPtr interp;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)) {
- uInternalError("Compat map not defined in WriteXKBCompatMap\n");
- return False;
- }
- if ((xkb->names==NULL)||(xkb->names->semantics==NullStringToken))
- fprintf(file,"xkb_compatibility%s\n\n",(topLevel?"":" {"));
- else fprintf(file,"xkb_compatibility \"%s\"%s\n\n",
- stText(xkb->names->semantics),
- (topLevel?"":" {"));
- WriteXKBVModDecl(file,xkb);
-
- fprintf(file,"interpret.useModMapMods= AnyLevel;\n");
- fprintf(file,"interpret.repeat= False;\n");
- fprintf(file,"interpret.locking= False;\n");
- interp= xkb->compat->sym_interpret;
- for (i=0;i<xkb->compat->num_si;i++,interp++) {
- fprintf(file,"interpret %s+%s(%s) {\n",
- ((interp->sym==NoSymbol)?"Any":
- keysymText(interp->sym,XkbXKBFile)),
- SIMatchText(interp->match,XkbXKBFile),
- modMaskText(interp->mods,XkbXKBFile));
- if (interp->virtual_mod!=XkbNoModifier) {
- fprintf(file," virtualModifier= %s;\n",
- VModText(xkb,interp->virtual_mod));
- }
- if (interp->match&XkbSI_LevelOneOnly)
- fprintf(file," useModMapMods=level1;\n");
- if (interp->match&XkbSI_LockingKey)
- fprintf(file," locking= True;\n");
- if (interp->match&XkbSI_Autorepeat)
- fprintf(file," repeat= True;\n");
- fprintf(file," action= ");
- WriteXKBAction(file,result,&interp->act);
- fprintf(file,";\n");
- fprintf(file,"};\n");
- }
- for (i=0;i<XkbNumModifiers;i++) {
- XkbModCompatPtr mc;
- int nOut;
-
- nOut= 0;
- mc= &xkb->compat->real_mod_compat[i];
- if ((mc->mods==(1<<i))&&(mc->groups==0))
- continue;
- fprintf(file,"modifier %s = { ",modIndexText(i,XkbXKBFile));
- if (mc->mods!=(1<<i)) {
- fprintf(file,"mods= %s;",modMaskText(mc->mods,XkbXKBFile));
- nOut++;
- }
- if (mc->groups!=0) {
- fprintf(file,"%sgroups= 0x%x;",(nOut>0?", ":""),mc->groups);
- }
- fprintf(file," };\n");
- }
- for (i=0;i<XkbNumVirtualMods;i++) {
- XkbModCompatPtr mc;
- int nOut;
-
- nOut= 0;
- mc= &xkb->compat->vmod_compat[i];
- if ((mc->mods==0)&&(mc->groups==0))
- continue;
- fprintf(file,"modifier %s = { ",vmodIndexText(xkb,i,XkbXKBFile));
- if (mc->mods!=0) {
- fprintf(file,"mods= %s;",modMaskText(mc->mods,XkbXKBFile));
- nOut++;
- }
- if (mc->groups!=0) {
- fprintf(file,"%sgroups= 0x%x;",(nOut>0?", ":""),mc->groups);
- }
- fprintf(file," };\n");
- }
- if (!topLevel)
- fprintf(file,"};\n\n");
- return True;
-}
-
-static Bool
-WriteXKBSymbols(file,result,topLevel)
- FILE * file;
- XkbFileResult * result;
- Bool topLevel;
-{
-register int i;
-char buf[8],buf2[8];
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->map)||(!xkb->map->syms)||(!xkb->map->key_sym_map)) {
- uInternalError("Symbols not defined in WriteXKBSymbols\n");
- return False;
- }
- if ((!xkb->names)||(!xkb->names->keys)) {
- uInternalError("Key names not defined in WriteXKBSymbols\n");
- return False;
- }
- if ((xkb->names==NULL)||(xkb->names->symbols==NullStringToken))
- fprintf(file,"xkb_symbols%s\n\n",(topLevel?"":" {"));
- else fprintf(file,"xkb_symbols \"%s\"%s\n\n",stText(xkb->names->symbols),
- (topLevel?"":" {"));
- for (i=xkb->min_key_code;i<=xkb->max_key_code;i++) {
- Bool simple;
- if (XkbKeyNumSyms(xkb,i)<1)
- continue;
- simple= True;
- LongToKeyName(xkb->names->keys[i],buf);
- buf[4]= '\0';
- sprintf(buf2,"<%s>",buf);
- fprintf(file,"key %6s = {",buf2);
- if (xkb->server->explicit) {
- if ((xkb->server->explicit[i]&XkbExplicitKeyTypeMask)!=0) {
- int typeNdx= xkb->map->key_sym_map[i].kt_index;
- fprintf(file,"\n type= \"%s\",",
- stText(xkb->map->types[typeNdx].name));
- simple= False;
- }
- if (result->defined&PerKeyRepeatDefined) {
- if ((xkb->server->explicit[i]&XkbExplicitAutorepeatMask)!=0) {
- if (result->repeat[i/8]&(1<<(i%8)))
- fprintf(file,"\n repeat= Yes,");
- else fprintf(file,"\n repeat= No,");
- simple= False;
- }
- }
- }
- if (xkb->server->behaviors!=NULL) {
- unsigned type,permanent;
- type= xkb->server->behaviors[i].type&XkbKB_OpMask;
- permanent=((xkb->server->behaviors[i].type&XkbKB_Permanent)!=0);
-
- if (type==XkbKB_Lock) {
- simple= False;
- fprintf(file,"\n lock= %s,",(permanent?"Permanent":"True"));
- }
- else if (type==XkbKB_RadioGroup) {
- simple= False;
- if (permanent)
- fprintf(file,"\n permanentRadioGroup= ");
- else fprintf(file,"\n radioGroup= ");
- fprintf(file,"%d,",xkb->server->behaviors[i].data+1);
- }
- else if (type!=XkbKB_Default) {
- uInternalError("Unknown key behavior %d encountered\n",type);
- uAction("Generated XKB description of <%s> might be wrong\n",
- longText(xkb->names->keys[i]));
- }
- }
- if ((XkbKeyNumGroups(xkb,i)>1)||(XkbKeyHasActions(xkb,i)))
- simple= False;
- if (simple) {
- KeySym *syms;
- unsigned s;
-
- syms= XkbKeySymsPtr(xkb,i);
- fprintf(file," [ ");
- for (s=0;s<XkbKeyGroupWidth(xkb,i);s++) {
- if (s!=0)
- fprintf(file,", ");
- fprintf(file,"%15s",keysymText(*syms++,XkbXKBFile));
- }
- fprintf(file," ] };\n");
- }
- else {
- unsigned g,s;
- KeySym *syms;
- XkbAction *acts;
- syms= XkbKeySymsPtr(xkb,i);
- acts= XkbKeyActionsPtr(xkb,i);
- for (g=0;g<XkbKeyNumGroups(xkb,i);g++) {
- if (g!=0)
- fprintf(file,",");
- fprintf(file,"\n symbols[Group%d]= [ ",g+1);
- for (s=0;s<XkbKeyGroupWidth(xkb,i);s++) {
- if (s!=0)
- fprintf(file,", ");
- fprintf(file,"%15s",keysymText(*syms++,XkbXKBFile));
- }
- fprintf(file," ]");
- if (XkbKeyHasActions(xkb,i)) {
- fprintf(file,",\n actions[Group%d]= [ ",g+1);
- for (s=0;s<XkbKeyGroupWidth(xkb,i);s++) {
- if (s!=0)
- fprintf(file,", ");
- WriteXKBAction(file,result,(XkbAnyAction *)acts++);
- }
- fprintf(file," ]");
- }
- }
- fprintf(file,"\n};\n");
- }
- }
- if (result->defined&ModMapDefined) {
- for (i=xkb->min_key_code;i<=xkb->max_key_code;i++) {
- if (result->modmap[i]!=0) {
- register int n,bit;
- for (bit=1,n=0;n<XkbNumModifiers;n++,bit<<=1) {
- if (result->modmap[i]&bit) {
- char buf[5];
- memcpy(buf,xkb->names->keys[i].name,4);
- buf[4]= '\0';
- fprintf(file,"modifier_map %s = { <%s> };\n",
- modIndexText(n,XkbXKBFile),buf);
- }
- }
- }
- }
- }
- if (!topLevel)
- fprintf(file,"};\n\n");
- return True;
-}
-
-static Bool
-WriteXKBKeymap(file,result,topLevel)
- FILE * file;
- XkbFileResult * result;
- Bool topLevel;
-{
-Bool ok;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- fprintf(file,"xkb_keymap\n");
- ok= WriteXKBKeycodes(file,result,False);
- ok= ok&&WriteXKBKeyTypes(file,result,False);
- ok= ok&&WriteXKBCompatMap(file,result,False);
- ok= ok&&WriteXKBSymbols(file,result,False);
-#ifdef NOTDEF
- ok= ok&&WriteCHdrGeometry(file,result,False);
-#endif
- return ok;
-}
-
-Bool
-WriteSourceKbdDesc(name,type,result)
- char * name;
- unsigned type;
- XkbFileResult * result;
-{
-FILE * out;
-Bool ok;
-Bool (*func)();
-
- switch (type) {
- case XkmSemanticsFile:
- case XkmLayoutFile:
- uInternalError("Can't create an XKB file containing %s yet\n",
- configText(type));
- return False;
- case XkmKeymapFile:
- func= WriteXKBKeymap;
- break;
- case XkmTypesIndex:
- func= WriteXKBKeyTypes;
- break;
- case XkmCompatMapIndex:
- func= WriteXKBCompatMap;
- break;
- case XkmSymbolsIndex:
- func= WriteXKBSymbols;
- break;
- case XkmKeyNamesIndex:
- func= WriteXKBKeycodes;
- break;
- case XkmGeometryFile:
- case XkmGeometryIndex:
- case XkmAlternateSymsFile:
- case XkmVirtualModsIndex:
- case XkmIndicatorsIndex:
- uInternalError("Can't create an XKB file containing %s yet\n",
- configText(type));
- return False;
- }
- out= fopen(name,"w");
- if (out==NULL) {
- uError("Couldn't open output file \"%s\"\n",name);
- ok= False;
- }
- else {
- ok= (*func)(out,result,True);
- fclose(out);
- }
-
- if (!ok) {
- uAction("Key Map source not written\n");
- return False;
- }
- return True;
-}
diff --git a/xc/programs/xkbcomp/xkbparse.h b/xc/programs/xkbcomp/xkbparse.h
index c492a01f1..405084467 100644
--- a/xc/programs/xkbcomp/xkbparse.h
+++ b/xc/programs/xkbcomp/xkbparse.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbparse.h,v 1.1 94/04/02 17:09:16 erik Exp $ */
+/* $XConsortium: xkbparse.h,v 1.2 94/04/04 15:28:46 rws Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbparse.y b/xc/programs/xkbcomp/xkbparse.y
index fcfe8feac..ff67a9591 100644
--- a/xc/programs/xkbcomp/xkbparse.y
+++ b/xc/programs/xkbcomp/xkbparse.y
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbparse.y,v 1.4 93/09/28 20:16:45 rws Exp $ */
+/* $XConsortium: xkbparse.y,v 1.3 94/04/08 15:30:22 erik Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkbscan.c b/xc/programs/xkbcomp/xkbscan.c
index 4e375beb6..227479d15 100644
--- a/xc/programs/xkbcomp/xkbscan.c
+++ b/xc/programs/xkbcomp/xkbscan.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkbscan.c,v 1.1 94/04/02 17:09:37 erik Exp $ */
+/* $XConsortium: xkbscan.c,v 1.2 94/04/04 15:28:49 rws Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
diff --git a/xc/programs/xkbcomp/xkmout.c b/xc/programs/xkbcomp/xkmout.c
deleted file mode 100644
index 7204d40ef..000000000
--- a/xc/programs/xkbcomp/xkmout.c
+++ /dev/null
@@ -1,695 +0,0 @@
-/* $XConsortium: xkmout.c,v 1.4 93/09/28 20:16:45 rws Exp $ */
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- 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.
-
- ********************************************************/
-
-#define DEBUG_VAR_NOT_LOCAL
-#define DEBUG_VAR debugFlags
-#include "xkbcomp.h"
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#endif
-#include "tokens.h"
-
-#include <X11/extensions/XKB.h>
-#include <X11/XKBlib.h>
-#include "XKMformat.h"
-
-
-typedef struct _XkmInfo {
- unsigned short bound_vmods;
- unsigned short named_vmods;
- unsigned char num_bound;
- unsigned char compat_mods;
- unsigned short compat_vmods;
-} XkmInfo;
-
-/***====================================================================***/
-
-#define xkmPutCARD8(f,v) (putc(v,f),1)
-
-int
-xkmPutCARD16(file,val)
- FILE * file;
- unsigned val;
-{
- putc(((val>>8)&0xff),file);
- putc((val&0xff),file);
- return 2;
-}
-
-int
-xkmPutCARD32(file,val)
- FILE * file;
- unsigned long val;
-{
- putc(((val>>24)&0xff),file);
- putc(((val>>16)&0xff),file);
- putc(((val>>8)&0xff),file);
- putc((val&0xff),file);
- return 4;
-}
-
-int
-xkmPutPadding(file,pad)
- FILE * file;
- unsigned pad;
-{
-int i;
- for (i=0;i<pad;i++) {
- putc('\0',file);
- }
- return pad;
-}
-
-int
-xkmPutCountedBytes(file,ptr,count)
- FILE * file;
- char * ptr;
- unsigned count;
-{
-register int nOut,pad;
- if (count==0)
- return xkmPutCARD32(file,0);
-
- xkmPutCARD16(file,count);
- nOut= fwrite(ptr,1,count,file);
- if (nOut<0)
- return 2;
- nOut= count+2;
- pad= XkbPaddedSize(nOut)-nOut;
- if (pad)
- xkmPutPadding(file,pad);
- return nOut+pad;
-}
-
-unsigned
-xkmSizeCountedString(str)
- char * str;
-{
- if (str==NULL)
- return 4;
- return XkbPaddedSize(strlen(str)+2);
-}
-
-int
-xkmPutCountedString(file,str)
- FILE * file;
- char * str;
-{
- if (str==NULL)
- return xkmPutCARD32(file,0);
- return xkmPutCountedBytes(file,str,strlen(str));
-}
-
-/***====================================================================***/
-
-static unsigned
-SizeXKMVirtualMods(result,info)
- XkbFileResult * result;
- XkmInfo * info;
-{
-XkbDescPtr xkb;
-unsigned nBound,bound;
-unsigned nNamed,named,szNames;
-register unsigned i,bit;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->names)||(!xkb->server)) {
- uInternalError("Vmod mod bindings or names missing in SizeXKMVirtualMods\n");
- return 0;
- }
- bound=named=0;
- for (i=nBound=nNamed=szNames=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
- if (xkb->server->vmods[i]!=XkbNoModifier) {
- bound|= bit;
- nBound++;
- }
- if (xkb->names->vmods[i]!=(Atom)NullStringToken) {
- register char *name;
- named|= bit;
- name= stGetString((StringToken)xkb->names->vmods[i]);
- szNames+= xkmSizeCountedString(name);
- nNamed++;
- }
- }
- info->num_bound= nBound;
- info->bound_vmods= bound;
- info->named_vmods= named;
- if ((nBound==0)&&(nNamed==0))
- return 0;
- return 4+XkbPaddedSize(nBound)+szNames;
-}
-
-static Bool
-WriteXKMVirtualMods(file,result,info)
- FILE * file;
- XkbFileResult * result;
- XkmInfo * info;
-{
-register unsigned int i,bit;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- xkmPutCARD16(file,info->bound_vmods);
- xkmPutCARD16(file,info->named_vmods);
- for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
- if (info->bound_vmods&bit)
- xkmPutCARD8(file,xkb->server->vmods[i]);
- }
- if ((i= XkbPaddedSize(info->num_bound)-info->num_bound)>0)
- xkmPutPadding(file,i);
- for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
- if (info->named_vmods&bit) {
- register char *name;
- name= stGetString((StringToken)xkb->names->vmods[i]);
- xkmPutCountedString(file,name);
- }
- }
- return True;
-}
-
-/***====================================================================***/
-
-static unsigned
-SizeXKMKeycodes(result,info)
- XkbFileResult * result;
- XkmInfo * info;
-{
-XkbDescPtr xkb;
-StringToken kcName;
-int size;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
- uInternalError("Key names not defined in SizeXKMKeycodes\n");
- return 0;
- }
- kcName= (StringToken)xkb->names->keycodes;
- size= 4; /* min and max keycode */
- size+= xkmSizeCountedString(stGetString(kcName));
- size+= XkbNumKeys(xkb)*sizeof(XkbKeyNameRec);
- return size;
-}
-
-static Bool
-WriteXKMKeycodes(file,result,info)
- FILE * file;
- XkbFileResult * result;
- XkmInfo * info;
-{
-XkbDescPtr xkb;
-StringToken kcName;
-char *start;
-register int i;
-
- xkb= &result->xkb;
- kcName= (StringToken)xkb->names->keycodes;
- start= xkb->names->keys[xkb->min_key_code].name;
-
- xkmPutCARD8(file,xkb->min_key_code);
- xkmPutCARD8(file,xkb->max_key_code);
- xkmPutPadding(file,2);
- xkmPutCountedString(file,stGetString(kcName));
- fwrite(start,sizeof(XkbKeyNameRec),XkbNumKeys(xkb),file);
- return True;
-}
-
-/***====================================================================***/
-
-static unsigned
-SizeXKMKeyTypes(result,info)
- XkbFileResult * result;
- XkmInfo * info;
-{
-register int i,n,size;
-XkbKeyTypePtr type;
-XkbDescPtr xkb;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->map)||(!xkb->map->types)) {
- uInternalError("Key types not defined in SizeXKBKeyTypes\n");
- return 0;
- }
- size= 4; /* room for # of key types + padding */
- for (i=0,type=xkb->map->types;i<xkb->map->num_types;i++,type++) {
- size+= SIZEOF(xkmKeyTypeDesc);
- size+= SIZEOF(xkmKTMapEntryDesc)*type->map_count;
- size+= xkmSizeCountedString(stGetString(type->name));
- if (type->preserve)
- size+= SIZEOF(xkmKTPreserveDesc)*type->map_count;
- if (type->lvl_names) {
- StringToken *names;
- names= (StringToken *)type->lvl_names;
- for (n=0;n<type->group_width;n++) {
- size+= xkmSizeCountedString(stGetString(names[n]));
- }
- }
- }
- return size;
-}
-
-static Bool
-WriteXKMKeyTypes(file,result,info)
- FILE * file;
- XkbFileResult * result;
- XkmInfo * info;
-{
-register int i,n;
-XkbDescPtr xkb;
-XkbKeyTypePtr type;
-xkmKeyTypeDesc wire;
-XkbKTMapEntryPtr entry;
-xkmKTMapEntryDesc wire_entry;
-StringToken * names;
-
- xkb= &result->xkb;
- xkmPutCARD16(file,xkb->map->num_types);
- xkmPutPadding(file,2);
- type= xkb->map->types;
- for (i=0;i<xkb->map->num_types;i++,type++) {
- wire.realMods= type->real_mods;
- wire.groupWidth= type->group_width;
- wire.virtualMods= type->vmods;
- wire.nMapEntries= type->map_count;
- wire.preserve= (type->preserve!=NULL);
- if (type->lvl_names!=NULL)
- wire.nLevelNames= type->group_width;
- else wire.nLevelNames= 0;
- fwrite(&wire,SIZEOF(xkmKeyTypeDesc),1,file);
- for (n=0,entry= type->map;n<type->map_count;n++,entry++) {
- wire_entry.level= entry->level;
- wire_entry.realMods= entry->real_mods;
- wire_entry.virtualMods= entry->vmods;
- fwrite(&wire_entry,SIZEOF(xkmKTMapEntryDesc),1,file);
- }
- xkmPutCountedString(file,stGetString((StringToken)type->name));
- if (type->preserve) {
- xkmKTPreserveDesc p_entry;
- XkbKTPreservePtr pre;
- for (n=0,pre=type->preserve;n<type->map_count;n++,pre++) {
- p_entry.realMods= pre->real_mods;
- p_entry.virtualMods= pre->vmods;
- fwrite(&p_entry,SIZEOF(xkmKTPreserveDesc),1,file);
- }
- }
- if (type->lvl_names!=NULL) {
- names= type->lvl_names;
- for (n=0;n<wire.nLevelNames;n++) {
- xkmPutCountedString(file,stGetString(names[n]));
- }
- }
- }
- return True;
-}
-
-/***====================================================================***/
-
-static unsigned
-SizeXKMCompatMap(result,info)
- XkbFileResult * result;
- XkmInfo * info;
-{
-XkbDescPtr xkb;
-char *name;
-int size;
-register int i;
-unsigned mods,nMods;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)) {
- uInternalError("Compat map not defined in SizeXKMCompatMap\n");
- return 0;
- }
- if (xkb->names) name= stGetString((StringToken)xkb->names->semantics);
- else name= NULL;
-
- nMods= 0;
- for (i=mods=0;i<XkbNumModifiers;i++) {
- if ((xkb->compat->real_mod_compat[i].groups!=0)||
- (xkb->compat->real_mod_compat[i].mods!=(1<<i))) {
- mods|= (1<<i);
- nMods++;
- }
- }
- info->compat_mods= mods;
- for (i=mods=0;i<XkbNumVirtualMods;i++) {
- if ((xkb->compat->vmod_compat[i].groups!=0)||
- (xkb->compat->vmod_compat[i].mods!=0)) {
- mods|= (1<<i);
- nMods++;
- }
- }
- info->compat_vmods= mods;
- size= 4+xkmSizeCountedString(name);
- size+= (SIZEOF(xkmSymInterpretDesc)*xkb->compat->num_si);
- size+= XkbPaddedSize(2*nMods);
- return size;
-}
-
-static Bool
-WriteXKMCompatMap(file,result,info)
- FILE * file;
- XkbFileResult * result;
- XkmInfo * info;
-{
-register int i;
-char * name;
-XkbDescPtr xkb;
-XkbSymInterpretPtr interp;
-xkmSymInterpretDesc wire;
-
- xkb= &result->xkb;
- if (xkb->names) name= stGetString((StringToken)xkb->names->semantics);
- else name= NULL;
- xkmPutCARD16(file,xkb->compat->num_si);
- xkmPutPadding(file,2);
- xkmPutCountedString(file,name);
- interp= xkb->compat->sym_interpret;
- for (i=0;i<xkb->compat->num_si;i++,interp++) {
- wire.sym= interp->sym;
- wire.mods= interp->mods;
- wire.match= interp->match;
- wire.virtualMod= interp->virtual_mod;
- wire.flags= interp->flags;
- wire.actionType= interp->act.type;
- wire.actionData[0]= interp->act.data[0];
- wire.actionData[1]= interp->act.data[1];
- wire.actionData[2]= interp->act.data[2];
- wire.actionData[3]= interp->act.data[3];
- wire.actionData[4]= interp->act.data[4];
- wire.actionData[5]= interp->act.data[5];
- wire.actionData[6]= interp->act.data[6];
- fwrite(&wire,SIZEOF(xkmSymInterpretDesc),1,file);
- }
- xkmPutCARD8(file,info->compat_mods);
- xkmPutPadding(file,1);
- xkmPutCARD16(file,info->compat_vmods);
- if (info->compat_mods) {
- register unsigned bit;
- for (i=0,bit=1;i<XkbNumModifiers;i++,bit<<=1) {
- if (info->compat_mods&bit) {
- xkmPutCARD8(file,xkb->compat->real_mod_compat[i].mods);
- xkmPutCARD8(file,xkb->compat->real_mod_compat[i].groups);
- }
- }
- }
- if (info->compat_vmods) {
- register unsigned bit;
- for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
- if (info->compat_vmods&bit) {
- xkmPutCARD8(file,xkb->compat->vmod_compat[i].mods);
- xkmPutCARD8(file,xkb->compat->vmod_compat[i].groups);
- }
- }
- }
- return True;
-}
-
-/***====================================================================***/
-
-static unsigned
-SizeXKMSymbols(result,info)
- XkbFileResult * result;
- XkmInfo * info;
-{
-XkbDescPtr xkb;
-unsigned size;
-register int i,nSyms;
-
- xkb= &result->xkb;
- if ((!xkb)||(!xkb->map)||((!xkb->map->syms))) {
- uInternalError("Symbols not defined in SizeXKMSymbols\n");
- return 0;
- }
- size= 4; /* min and max keycode */
- for (i=xkb->min_key_code;i<=(int)xkb->max_key_code;i++) {
- nSyms= XkbKeyNumSyms(xkb,i);
- size+= SIZEOF(xkmKeySymMapDesc)+(nSyms*4);
- if (xkb->server) {
- if (xkb->server->explicit[i]&XkbExplicitKeyTypeMask) {
- char *name;
- name= stGetString((StringToken)XkbKeyKeyType(xkb,i)->name);
- if (name!=NULL)
- size+= xkmSizeCountedString(name);
- }
- if (XkbKeyHasActions(xkb,i))
- size+= nSyms*SIZEOF(xkmActionDesc);
- if (xkb->server->behaviors[i].type!=XkbKB_Default)
- size+= SIZEOF(xkmBehaviorDesc);
- }
- }
- return size;
-}
-
-static Bool
-WriteXKMSymbols(file,result,info)
- FILE * file;
- XkbFileResult * result;
- XkmInfo * info;
-{
-XkbDescPtr xkb;
-register int i,n;
-xkmKeySymMapDesc wireMap;
-
- xkb= &result->xkb;
- xkmPutCARD8(file,xkb->min_key_code);
- xkmPutCARD8(file,xkb->max_key_code);
- for (i=xkb->min_key_code;i<(int)xkb->max_key_code;i++) {
- register char *typeName;
- wireMap.group_width= XkbKeyGroupWidth(xkb,i);
- wireMap.num_groups= XkbKeyNumGroups(xkb,i);
- if (result->defined&ModMapDefined)
- wireMap.modifier_map= result->modmap[i];
- else wireMap.modifier_map= 0;
- wireMap.flags= 0;
- typeName= NULL;
- if (xkb->server) {
- if (xkb->server->explicit[i]&XkbExplicitKeyTypeMask) {
- typeName= stGetString((StringToken)XkbKeyKeyType(xkb,i)->name);
- if (typeName!=NULL)
- wireMap.flags|= XkmKeyHasType;
- }
- if (XkbKeyHasActions(xkb,i))
- wireMap.flags|= XkmKeyHasActions;
- if (xkb->server->behaviors[i].type!=XkbKB_Default)
- wireMap.flags|= XkmKeyHasBehavior;
- if ((result->defined&PerKeyRepeatDefined)&&
- (xkb->server->explicit[i]&XkbExplicitAutorepeatMask)) {
- if (result->repeat[(i/8)]&(1<<(i%8)))
- wireMap.flags|= XkmRepeatingKey;
- else wireMap.flags|= XkmNonRepeatingKey;
- }
- }
- fwrite(&wireMap,SIZEOF(xkmKeySymMapDesc),1,file);
- if (typeName!=NULL)
- xkmPutCountedString(file,typeName);
- if (wireMap.num_groups>0) {
- KeySym *sym;
- sym= XkbKeySymsPtr(xkb,i);
- for (n=XkbKeyNumSyms(xkb,i);n>0;n--,sym++) {
- xkmPutCARD32(file,(CARD32)*sym);
- }
- if (wireMap.flags&XkmKeyHasActions) {
- XkbAction * act;
- act= XkbKeyActionsPtr(xkb,i);
- for (n=XkbKeyNumActions(xkb,i);n>0;n--,act++) {
- fwrite(&act,SIZEOF(xkmActionDesc),1,file);
- }
- }
- }
- if (wireMap.flags&XkmKeyHasBehavior) {
- xkmBehaviorDesc b;
- b.type= xkb->server->behaviors[i].type;
- b.data= xkb->server->behaviors[i].data;
- fwrite(&b,SIZEOF(xkmBehaviorDesc),1,file);
- }
- }
- return True;
-}
-
-/***====================================================================***/
-
-static int
-GetXKMSemanticsTOC(result,info,max_toc,toc_rtrn)
- XkbFileResult * result;
- XkmInfo * info;
- int max_toc;
- xkmSectionInfo * toc_rtrn;
-{
-int num_toc;
-int total_size;
-
- total_size= num_toc=0;
- toc_rtrn[num_toc].size= SizeXKMVirtualMods(result,info);
- if (toc_rtrn[num_toc].size>0) {
- toc_rtrn[num_toc].type= XkmVirtualModsIndex;
- toc_rtrn[num_toc].format= MSBFirst;
- toc_rtrn[num_toc].size+= SIZEOF(xkmSectionInfo);
- toc_rtrn[num_toc].offset= total_size;
- total_size+= toc_rtrn[num_toc].size;
- num_toc++;
- }
- toc_rtrn[num_toc].size= SizeXKMKeyTypes(result,info);
- if (toc_rtrn[num_toc].size>0) {
- toc_rtrn[num_toc].type= XkmTypesIndex;
- toc_rtrn[num_toc].format= MSBFirst;
- toc_rtrn[num_toc].size+= SIZEOF(xkmSectionInfo);
- toc_rtrn[num_toc].offset= total_size;
- total_size+= toc_rtrn[num_toc].size;
- num_toc++;
- }
- toc_rtrn[num_toc].size= SizeXKMCompatMap(result,info);
- if (toc_rtrn[num_toc].size>0) {
- toc_rtrn[num_toc].type= XkmCompatMapIndex;
- toc_rtrn[num_toc].format= MSBFirst;
- toc_rtrn[num_toc].size+= SIZEOF(xkmSectionInfo);
- toc_rtrn[num_toc].offset= total_size;
- total_size+= toc_rtrn[num_toc].size;
- num_toc++;
- }
- return num_toc;
-}
-
-static int
-GetXKMLayoutTOC(result,info,max_toc,toc_rtrn)
- XkbFileResult * result;
- XkmInfo * info;
- int max_toc;
- xkmSectionInfo * toc_rtrn;
-{
- return 0;
-}
-
-static int
-GetXKMKeymapTOC(result,info,max_toc,toc_rtrn)
- XkbFileResult * result;
- XkmInfo * info;
- int max_toc;
- xkmSectionInfo * toc_rtrn;
-{
- return 0;
-}
-
-static Bool
-WriteXKMFile(file,result,num_toc,toc,info)
- FILE * file;
- XkbFileResult * result;
- int num_toc;
- xkmSectionInfo * toc;
- XkmInfo * info;
-{
-register int i,size;
-Bool ok= True;
-
- for (i=0;(i<num_toc)&&(ok);i++) {
- fwrite(&toc[i],SIZEOF(xkmSectionInfo),1,file);
- switch (toc[i].type) {
- case XkmVirtualModsIndex:
- ok= WriteXKMVirtualMods(file,result,info);
- break;
- case XkmTypesIndex:
- ok= WriteXKMKeyTypes(file,result,info);
- break;
- case XkmCompatMapIndex:
- ok= WriteXKMCompatMap(file,result,info);
- break;
- default:
- uInternalError("Bogus toc type %d in WriteXKMSemantics\n",
- toc[i].type);
- break;
- }
- }
- return ok;
-}
-
-
-#define MAX_TOC 16
-
-Bool
-WriteCompiledKbdDesc(name,type,result)
- char * name;
- unsigned type;
- XkbFileResult * result;
-{
-FILE * out;
-Bool ok;
-XkbDescPtr xkb;
-XkmInfo info;
-Bool (*writer)();
-int (*getTOC)();
-int size_toc,i;
-unsigned hdr;
-xkmFileInfo fileInfo;
-xkmSectionInfo toc[MAX_TOC];
-
- switch (type) {
- case XkmSemanticsFile:
- writer= WriteXKMFile;
- getTOC= GetXKMSemanticsTOC;
- break;
- case XkmLayoutFile:
- writer= WriteXKMFile;
- getTOC= GetXKMLayoutTOC;
- break;
- case XkmKeymapFile:
- writer= WriteXKMFile;
- getTOC= GetXKMKeymapTOC;
- break;
- default:
- uError("Cannot create an XKM file from a %s description\n",
- configText(type));
- uAction("You must specify a semantics, layout or keymap file\n");
- return False;
- }
- xkb= &result->xkb;
-
- bzero((char *)&info,sizeof(XkmInfo));
- size_toc= (*getTOC)(result,&info,MAX_TOC,toc);
- if (size_toc<1) {
- uInternalError("Nothing to compile in WriteCompiledKbdDesc!!\n");
- return False;
- }
- out= fopen(name,"w");
- if (out==NULL) {
- uError("Couldn't open output file \"%s\"\n",name);
- uAction("Exiting\n");
- return False;
- }
- for (i=0;i<size_toc;i++) {
- toc[i].offset+= (8+(size_toc*SIZEOF(xkmSectionInfo)));;
- }
- hdr= (('x'<<24)|('k'<<16)|('m'<<8)|XkmFileVersion);
- xkmPutCARD32(out,hdr);
- fileInfo.type= type;
- fileInfo.min_kc= xkb->min_key_code;
- fileInfo.max_kc= xkb->max_key_code;
- fileInfo.num_toc= size_toc;
- fwrite(&fileInfo,SIZEOF(xkmFileInfo),1,out);
- fwrite(toc,SIZEOF(xkmSectionInfo),size_toc,out);
- ok= (*writer)(out,result,size_toc,toc,&info);
- fclose(out);
- return True;
-}
diff --git a/xc/programs/xkill/Imakefile b/xc/programs/xkill/Imakefile
index 826de49f4..c59f1bb07 100644
--- a/xc/programs/xkill/Imakefile
+++ b/xc/programs/xkill/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.4 91/07/17 00:47:39 gildea Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
diff --git a/xc/programs/xkill/xkill.c b/xc/programs/xkill/xkill.c
index b80aeaecb..2964ece1b 100644
--- a/xc/programs/xkill/xkill.c
+++ b/xc/programs/xkill/xkill.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xkill.c,v 1.18 91/03/20 19:44:15 converse Exp $ */
+/* $XConsortium: xkill.c,v 1.19 94/04/17 20:24:50 converse Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xkill/xkill.man b/xc/programs/xkill/xkill.man
index b7effff2c..422fb2a73 100644
--- a/xc/programs/xkill/xkill.man
+++ b/xc/programs/xkill/xkill.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xkill.man,v 1.14 94/04/14 11:32:09 dpw Exp $
+.\" $XConsortium: xkill.man,v 1.15 94/04/17 20:24:50 dpw Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xlogo/Imakefile b/xc/programs/xlogo/Imakefile
index bb59be839..ce1408417 100644
--- a/xc/programs/xlogo/Imakefile
+++ b/xc/programs/xlogo/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.8 93/09/18 20:05:42 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.9 93/09/20 10:17:33 kaleb Exp $
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
SRCS = xlogo.c Logo.c
diff --git a/xc/programs/xlogo/Logo.c b/xc/programs/xlogo/Logo.c
index 5a4726818..f870fc556 100644
--- a/xc/programs/xlogo/Logo.c
+++ b/xc/programs/xlogo/Logo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Logo.c,v 1.29 94/01/10 15:42:50 kaleb Exp $ */
+/* $XConsortium: Logo.c,v 1.30 94/04/17 20:24:08 kaleb Exp $ */
/*
Copyright (c) 1988, 1994 X Consortium
diff --git a/xc/programs/xlogo/LogoP.h b/xc/programs/xlogo/LogoP.h
index 9ceedd90b..a33ab4d39 100644
--- a/xc/programs/xlogo/LogoP.h
+++ b/xc/programs/xlogo/LogoP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: LogoP.h,v 1.10 93/09/18 20:06:06 rws Exp $ */
+/* $XConsortium: LogoP.h,v 1.11 94/04/17 20:24:09 rws Exp $ */
/*
Copyright (c) 1988, 1993 X Consortium
diff --git a/xc/programs/xlogo/XLogo-co.ad b/xc/programs/xlogo/XLogo-co.ad
index 742a3191a..c6cfc7634 100644
--- a/xc/programs/xlogo/XLogo-co.ad
+++ b/xc/programs/xlogo/XLogo-co.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: XLogo-co.ad,v 1.2 94/02/09 19:44:04 gildea Exp $
#include "XLogo"
! MIT colors are Cardinal Red (Pantone 201c) and Silver Grey (Pantone 421c)
XLogo*background: rgb:d2/22/32
diff --git a/xc/programs/xlogo/xlogo.c b/xc/programs/xlogo/xlogo.c
index 388bb1ac7..870edce12 100644
--- a/xc/programs/xlogo/xlogo.c
+++ b/xc/programs/xlogo/xlogo.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xlogo.c,v 1.19 94/04/02 17:01:57 converse Exp $
+ * $XConsortium: xlogo.c,v 1.20 94/04/17 20:24:10 converse Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xlogo/xlogo.man b/xc/programs/xlogo/xlogo.man
index 88196015a..4771bbcc3 100644
--- a/xc/programs/xlogo/xlogo.man
+++ b/xc/programs/xlogo/xlogo.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xlogo.man,v 1.23 94/04/14 11:25:05 dpw Exp $
+.\" $XConsortium: xlogo.man,v 1.24 94/04/17 20:24:11 dpw Exp $
.\" Copyright (c) 1988, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xlsatoms/Imakefile b/xc/programs/xlsatoms/Imakefile
index 156f0fe6f..6aa421bbd 100644
--- a/xc/programs/xlsatoms/Imakefile
+++ b/xc/programs/xlsatoms/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.2 91/07/16 23:06:53 gildea Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
diff --git a/xc/programs/xlsatoms/xlsatoms.c b/xc/programs/xlsatoms/xlsatoms.c
index b14bb7426..c47726a5b 100644
--- a/xc/programs/xlsatoms/xlsatoms.c
+++ b/xc/programs/xlsatoms/xlsatoms.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xlsatoms.c,v 1.4 93/09/20 18:05:42 hersh Exp $
+ * $XConsortium: xlsatoms.c,v 1.5 94/04/17 20:38:45 hersh Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xlsatoms/xlsatoms.man b/xc/programs/xlsatoms/xlsatoms.man
index b7c76c0cb..bcb2bd100 100644
--- a/xc/programs/xlsatoms/xlsatoms.man
+++ b/xc/programs/xlsatoms/xlsatoms.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xlsatoms.man,v 1.9 94/04/14 11:28:45 dpw Exp $
+.\" $XConsortium: xlsatoms.man,v 1.10 94/04/17 20:38:46 dpw Exp $
.\" Copyright (c) 1989, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xlsclients/Imakefile b/xc/programs/xlsclients/Imakefile
index f8daf0660..2227d3237 100644
--- a/xc/programs/xlsclients/Imakefile
+++ b/xc/programs/xlsclients/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.5 91/07/17 16:07:41 gildea Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
SRCS = xlsclients.c
diff --git a/xc/programs/xlsclients/xlscli.man b/xc/programs/xlsclients/xlscli.man
index 5bd60bc73..f25150048 100644
--- a/xc/programs/xlsclients/xlscli.man
+++ b/xc/programs/xlsclients/xlscli.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xlscli.man,v 1.7 94/04/14 11:16:36 dpw Exp $
+.\" $XConsortium: xlscli.man,v 1.8 94/04/17 20:38:31 dpw Exp $
.\" Copyright (c) 1991, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xlsclients/xlsclients.c b/xc/programs/xlsclients/xlsclients.c
index 89fb2b29d..cf268535a 100644
--- a/xc/programs/xlsclients/xlsclients.c
+++ b/xc/programs/xlsclients/xlsclients.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xlsclients.c,v 1.6 90/12/18 15:01:56 gildea Exp $
+ * $XConsortium: xlsclients.c,v 1.7 94/04/17 20:38:32 gildea Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xlsfonts/Imakefile b/xc/programs/xlsfonts/Imakefile
index 8f32874bf..af82da9a1 100644
--- a/xc/programs/xlsfonts/Imakefile
+++ b/xc/programs/xlsfonts/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.8 91/07/17 00:47:23 gildea Exp $
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XLIB)
SRCS = xlsfonts.c dsimple.c
diff --git a/xc/programs/xlsfonts/dsimple.c b/xc/programs/xlsfonts/dsimple.c
index 4109b799e..b52920b2d 100644
--- a/xc/programs/xlsfonts/dsimple.c
+++ b/xc/programs/xlsfonts/dsimple.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.c,v 1.15 94/04/13 17:42:15 gildea Exp $ */
+/* $XConsortium: dsimple.c,v 1.16 94/04/17 20:24:36 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xlsfonts/dsimple.h b/xc/programs/xlsfonts/dsimple.h
index 14abfc94a..316fdbf5a 100644
--- a/xc/programs/xlsfonts/dsimple.h
+++ b/xc/programs/xlsfonts/dsimple.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.h,v 1.3 94/04/13 17:43:34 gildea Exp $ */
+/* $XConsortium: dsimple.h,v 1.4 94/04/17 20:24:36 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xlsfonts/xlsfonts.c b/xc/programs/xlsfonts/xlsfonts.c
index d7215166d..353b7c428 100644
--- a/xc/programs/xlsfonts/xlsfonts.c
+++ b/xc/programs/xlsfonts/xlsfonts.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xlsfonts.c,v 1.33 93/08/20 15:46:29 rws Exp $
+ * $XConsortium: xlsfonts.c,v 1.34 94/04/17 20:24:37 rws Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xlsfonts/xlsfonts.man b/xc/programs/xlsfonts/xlsfonts.man
index 69da16e6a..0339c6480 100644
--- a/xc/programs/xlsfonts/xlsfonts.man
+++ b/xc/programs/xlsfonts/xlsfonts.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xlsfonts.man,v 1.18 94/04/14 16:31:59 dpw Exp $
+.\" $XConsortium: xlsfonts.man,v 1.19 94/04/17 20:24:38 dpw Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xmag/CutPaste.c b/xc/programs/xmag/CutPaste.c
index a54e3aee2..6bdf503bd 100644
--- a/xc/programs/xmag/CutPaste.c
+++ b/xc/programs/xmag/CutPaste.c
@@ -1,4 +1,4 @@
-/* $XConsortium: CutPaste.c,v 1.7 93/08/17 20:52:58 rws Exp $ */
+/* $XConsortium: CutPaste.c,v 1.8 94/04/17 20:24:51 rws Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xmag/Imakefile b/xc/programs/xmag/Imakefile
index f262d9f19..d09423cf0 100644
--- a/xc/programs/xmag/Imakefile
+++ b/xc/programs/xmag/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.10 93/08/17 20:53:50 rws Exp $
+XCOMM $XConsortium: Imakefile,v 1.11 93/09/04 19:55:44 rws Exp $
DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES)
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
diff --git a/xc/programs/xmag/RootWin.c b/xc/programs/xmag/RootWin.c
index 15bf75a98..aed3dacc7 100644
--- a/xc/programs/xmag/RootWin.c
+++ b/xc/programs/xmag/RootWin.c
@@ -1,4 +1,4 @@
-/* $XConsortium: RootWin.c,v 1.2 93/09/04 19:55:29 rws Exp $ */
+/* $XConsortium: RootWin.c,v 1.3 94/04/17 20:24:52 rws Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xmag/RootWin.h b/xc/programs/xmag/RootWin.h
index ddff34e86..613a2b0e5 100644
--- a/xc/programs/xmag/RootWin.h
+++ b/xc/programs/xmag/RootWin.h
@@ -1,4 +1,4 @@
-/* $XConsortium: RootWin.h,v 1.1 90/12/06 20:40:52 dave Exp $ */
+/* $XConsortium: RootWin.h,v 1.2 94/04/17 20:24:53 dave Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xmag/RootWinP.h b/xc/programs/xmag/RootWinP.h
index 975dc3756..880e6acfb 100644
--- a/xc/programs/xmag/RootWinP.h
+++ b/xc/programs/xmag/RootWinP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: RootWinP.h,v 1.2 93/09/04 19:55:38 rws Exp $ */
+/* $XConsortium: RootWinP.h,v 1.3 94/04/17 20:24:55 rws Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xmag/Scale.c b/xc/programs/xmag/Scale.c
index e125b75bd..f341a4f3e 100644
--- a/xc/programs/xmag/Scale.c
+++ b/xc/programs/xmag/Scale.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Scale.c,v 1.19 94/11/30 16:36:25 kaleb Exp kaleb $ */
+/* $XConsortium: Scale.c,v 1.20 95/01/05 19:49:01 kaleb Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xmag/Scale.h b/xc/programs/xmag/Scale.h
index 272e4ef19..1b8fe7793 100644
--- a/xc/programs/xmag/Scale.h
+++ b/xc/programs/xmag/Scale.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Scale.h,v 1.5 94/04/13 17:49:22 gildea Exp $ */
+/* $XConsortium: Scale.h,v 1.6 94/04/17 20:24:59 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xmag/ScaleP.h b/xc/programs/xmag/ScaleP.h
index b5ed91745..4f3c42f54 100644
--- a/xc/programs/xmag/ScaleP.h
+++ b/xc/programs/xmag/ScaleP.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ScaleP.h,v 1.2 91/03/11 18:50:54 dave Exp $ */
+/* $XConsortium: ScaleP.h,v 1.3 94/04/17 20:25:00 dave Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xmag/Xmag.ad b/xc/programs/xmag/Xmag.ad
index 0d3bddaf1..4382921d5 100644
--- a/xc/programs/xmag/Xmag.ad
+++ b/xc/programs/xmag/Xmag.ad
@@ -1,4 +1,4 @@
-.\ "$XConsortium: Xmag.ad,v 1.13 92/05/19 09:42:10 dave Exp $
+.\ "$XConsortium: Xmag.ad,v 1.14 92/05/19 09:43:26 dave Exp $
*Font: fixed
*pane2*orientation: horizontal
*pane2*showGrip: False
diff --git a/xc/programs/xmag/xmag.c b/xc/programs/xmag/xmag.c
index d2cd91f5f..a238f079a 100644
--- a/xc/programs/xmag/xmag.c
+++ b/xc/programs/xmag/xmag.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xmag.c,v 1.28 93/09/04 19:55:40 rws Exp $ */
+/* $XConsortium: xmag.c,v 1.29 94/04/17 20:25:02 rws Exp $ */
/*
Copyright (c) 1991 X Consortium
diff --git a/xc/programs/xmag/xmag.man b/xc/programs/xmag/xmag.man
index 480ca21bd..d5967075d 100644
--- a/xc/programs/xmag/xmag.man
+++ b/xc/programs/xmag/xmag.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xmag.man,v 1.8 94/04/14 11:14:06 dpw Exp $
+.\" $XConsortium: xmag.man,v 1.9 94/04/17 20:25:05 dpw Exp $
.\" Copyright (c) 1991, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xmh/Imakefile b/xc/programs/xmh/Imakefile
index fa6f6477a..61f6f050f 100644
--- a/xc/programs/xmh/Imakefile
+++ b/xc/programs/xmh/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 2.23 94/02/04 14:42:02 kaleb Exp $
+XCOMM $XConsortium: Imakefile,v 2.24 94/02/10 19:54:10 rws Exp $
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK
#endif
diff --git a/xc/programs/xmh/Xmh.ad b/xc/programs/xmh/Xmh.ad
index 0714c534d..fd71a5c51 100644
--- a/xc/programs/xmh/Xmh.ad
+++ b/xc/programs/xmh/Xmh.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: Xmh.ad,v 1.32 94/02/09 19:44:06 gildea Exp $
! AppDefaultsVersion should only be defined in the site-wide file
Xmh.AppDefaultsVersion: 1
diff --git a/xc/programs/xmh/actions.h b/xc/programs/xmh/actions.h
index 61bced238..222dbbc5e 100644
--- a/xc/programs/xmh/actions.h
+++ b/xc/programs/xmh/actions.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: actions.h,v 1.9 91/07/17 21:20:49 converse Exp $
+ * $XConsortium: actions.h,v 1.10 94/04/17 20:24:00 converse Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xmh/bbox.c b/xc/programs/xmh/bbox.c
index f36339e05..9bb627d1a 100644
--- a/xc/programs/xmh/bbox.c
+++ b/xc/programs/xmh/bbox.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: bbox.c,v 2.34 91/07/05 18:22:39 converse Exp $
+ * $XConsortium: bbox.c,v 2.35 91/07/10 19:34:59 converse Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/bbox.h b/xc/programs/xmh/bbox.h
index 3243c3150..32d89f227 100644
--- a/xc/programs/xmh/bbox.h
+++ b/xc/programs/xmh/bbox.h
@@ -1,4 +1,4 @@
-/* $XConsortium: bbox.h,v 2.11 89/11/25 21:07:07 converse Exp $ */
+/* $XConsortium: bbox.h,v 2.12 91/07/10 19:34:09 converse Exp $ */
/*
* COPYRIGHT 1987
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xmh/bboxint.h b/xc/programs/xmh/bboxint.h
index 1a57a3714..fc062b049 100644
--- a/xc/programs/xmh/bboxint.h
+++ b/xc/programs/xmh/bboxint.h
@@ -1,4 +1,4 @@
-/* $XConsortium: bboxint.h,v 2.9 89/07/20 21:15:51 converse Exp $
+/* $XConsortium: bboxint.h,v 2.10 89/09/15 16:10:22 converse Exp $
*
* COPYRIGHT 1987
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xmh/command.c b/xc/programs/xmh/command.c
index 9663133a2..9d410682e 100644
--- a/xc/programs/xmh/command.c
+++ b/xc/programs/xmh/command.c
@@ -1,4 +1,4 @@
-/* $XConsortium: command.c,v 2.48 94/11/28 23:43:16 gildea Exp kaleb $ */
+/* $XConsortium: command.c,v 2.49 95/04/05 19:59:06 kaleb Exp $ */
/*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/compfuncs.c b/xc/programs/xmh/compfuncs.c
index ed3d4227f..ee200ca27 100644
--- a/xc/programs/xmh/compfuncs.c
+++ b/xc/programs/xmh/compfuncs.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: compfuncs.c,v 2.17 89/10/06 15:02:26 converse Exp $
+ * $XConsortium: compfuncs.c,v 2.18 92/04/08 12:20:08 rws Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/externs.h b/xc/programs/xmh/externs.h
index 56929b992..fe38c446a 100644
--- a/xc/programs/xmh/externs.h
+++ b/xc/programs/xmh/externs.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: externs.h,v 2.39 93/09/20 17:52:05 hersh Exp swick $
+ * $XConsortium: externs.h,v 2.40 94/08/26 18:07:47 swick Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/folder.c b/xc/programs/xmh/folder.c
index 83ca0e58d..55b825195 100644
--- a/xc/programs/xmh/folder.c
+++ b/xc/programs/xmh/folder.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: folder.c,v 2.43 94/08/26 18:08:21 swick Exp swick $
+ * $XConsortium: folder.c,v 2.44 94/08/29 20:25:49 swick Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/globals.h b/xc/programs/xmh/globals.h
index 7ebab9c32..b04307e9e 100644
--- a/xc/programs/xmh/globals.h
+++ b/xc/programs/xmh/globals.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: globals.h,v 2.38 91/07/17 21:23:56 converse Exp $
+ * $XConsortium: globals.h,v 2.39 91/07/18 21:03:15 converse Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/icon.c b/xc/programs/xmh/icon.c
deleted file mode 100644
index 1775c964a..000000000
--- a/xc/programs/xmh/icon.c
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $XConsortium: icon.c,v 2.8 91/01/10 22:46:17 gildea Exp $ */
-/* This file and the newmail.bit and nomail.bit files are obsolete in R5 */
diff --git a/xc/programs/xmh/init.c b/xc/programs/xmh/init.c
index 21947a0f0..d5f62c129 100644
--- a/xc/programs/xmh/init.c
+++ b/xc/programs/xmh/init.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: init.c,v 2.80 95/01/25 14:33:57 swick Exp swick $
+ * $XConsortium: init.c,v 2.81 95/01/25 14:56:39 swick Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/main.c b/xc/programs/xmh/main.c
index e4b520bba..cd0d7d78f 100644
--- a/xc/programs/xmh/main.c
+++ b/xc/programs/xmh/main.c
@@ -1,4 +1,4 @@
-/* $XConsortium: main.c,v 2.29 95/01/06 16:39:19 swick Exp swick $
+/* $XConsortium: main.c,v 2.30 95/01/25 14:33:57 swick Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/menu.c b/xc/programs/xmh/menu.c
index d0670672b..ce538d4cc 100644
--- a/xc/programs/xmh/menu.c
+++ b/xc/programs/xmh/menu.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: menu.c,v 1.6 94/02/08 15:06:37 kaleb Exp $
+ * $XConsortium: menu.c,v 1.7 94/04/17 20:24:02 kaleb Exp $
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xmh/miscfuncs.c b/xc/programs/xmh/miscfuncs.c
index 73e223c60..fcf5d1f72 100644
--- a/xc/programs/xmh/miscfuncs.c
+++ b/xc/programs/xmh/miscfuncs.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miscfuncs.c,v 1.6 91/07/13 17:52:59 gildea Exp kaleb $ */
+/* $XConsortium: miscfuncs.c,v 1.7 94/12/01 17:15:05 kaleb Exp $ */
#include <X11/Xos.h>
diff --git a/xc/programs/xmh/mlist.c b/xc/programs/xmh/mlist.c
index 1c1c7dc3f..1dbd333c4 100644
--- a/xc/programs/xmh/mlist.c
+++ b/xc/programs/xmh/mlist.c
@@ -1,4 +1,4 @@
-/* $XConsortium: mlist.c,v 2.9 89/07/21 18:56:29 converse Exp $" */
+/* $XConsortium: mlist.c,v 2.10 91/01/06 21:08:51 rws Exp $" */
/*
* COPYRIGHT 1987
diff --git a/xc/programs/xmh/mlist.h b/xc/programs/xmh/mlist.h
index c15139e3b..068f662bd 100644
--- a/xc/programs/xmh/mlist.h
+++ b/xc/programs/xmh/mlist.h
@@ -1,4 +1,4 @@
-/* $XConsortium: mlist.h,v 2.3 88/09/06 17:23:23 jim Exp $ */
+/* $XConsortium: mlist.h,v 2.4 89/05/04 15:11:31 converse Exp $ */
/*
* COPYRIGHT 1987
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xmh/msg.h b/xc/programs/xmh/msg.h
index 44a96cfee..5644d26ab 100644
--- a/xc/programs/xmh/msg.h
+++ b/xc/programs/xmh/msg.h
@@ -1,4 +1,4 @@
-/* $XConsortium: msg.h,v 2.5 89/05/04 15:12:28 converse Exp $ */
+/* $XConsortium: msg.h,v 2.7 89/07/20 21:12:59 converse Exp $ */
/*
* COPYRIGHT 1987
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xmh/pick.c b/xc/programs/xmh/pick.c
index da9de8337..1050ad3d8 100644
--- a/xc/programs/xmh/pick.c
+++ b/xc/programs/xmh/pick.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: pick.c,v 2.44 91/07/05 18:58:25 converse Exp $
+ * $XConsortium: pick.c,v 2.45 91/07/17 21:26:54 converse Exp $
*
*
* COPYRIGHT 1987
diff --git a/xc/programs/xmh/popup.c b/xc/programs/xmh/popup.c
index 60181785e..1274a05b7 100644
--- a/xc/programs/xmh/popup.c
+++ b/xc/programs/xmh/popup.c
@@ -1,4 +1,4 @@
-/* $XConsortium: popup.c,v 2.37 93/09/20 17:52:11 hersh Exp swick $
+/* $XConsortium: popup.c,v 2.38 94/08/26 18:04:22 swick Exp $
*
*
* COPYRIGHT 1989
diff --git a/xc/programs/xmh/screen.c b/xc/programs/xmh/screen.c
index b02eeca02..b54d889b3 100644
--- a/xc/programs/xmh/screen.c
+++ b/xc/programs/xmh/screen.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: screen.c,v 2.64 94/08/29 19:47:11 swick Exp swick $
+ * $XConsortium: screen.c,v 2.65 95/01/06 16:39:19 swick Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/toc.c b/xc/programs/xmh/toc.c
index e74c85721..3e81fb6f5 100644
--- a/xc/programs/xmh/toc.c
+++ b/xc/programs/xmh/toc.c
@@ -1,4 +1,4 @@
-/* $XConsortium: toc.c,v 2.58 94/08/26 18:06:29 swick Exp swick $
+/* $XConsortium: toc.c,v 2.59 95/01/09 16:52:53 swick Exp $
*
*
* COPYRIGHT 1987
diff --git a/xc/programs/xmh/toc.h b/xc/programs/xmh/toc.h
index 82228bf1d..e1b300cf9 100644
--- a/xc/programs/xmh/toc.h
+++ b/xc/programs/xmh/toc.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: toc.h,v 2.12 91/07/14 18:53:30 converse Exp $
+ * $XConsortium: toc.h,v 2.13 91/07/17 12:28:29 converse Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/tocfuncs.c b/xc/programs/xmh/tocfuncs.c
index fbdd93baa..a008687f3 100644
--- a/xc/programs/xmh/tocfuncs.c
+++ b/xc/programs/xmh/tocfuncs.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: tocfuncs.c,v 2.38 91/07/17 21:28:33 converse Exp $
+ * $XConsortium: tocfuncs.c,v 2.39 92/04/08 12:19:21 rws Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/tocintrnl.h b/xc/programs/xmh/tocintrnl.h
index 41d29aac9..7676a3fd1 100644
--- a/xc/programs/xmh/tocintrnl.h
+++ b/xc/programs/xmh/tocintrnl.h
@@ -1,4 +1,4 @@
-/* $XConsortium: tocintrnl.h,v 2.17 91/07/13 17:13:14 converse Exp $ */
+/* $XConsortium: tocintrnl.h,v 2.18 91/07/14 18:53:37 converse Exp $ */
/*
* COPYRIGHT 1987
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xmh/tocutil.c b/xc/programs/xmh/tocutil.c
index 59f67ef96..752ab07bc 100644
--- a/xc/programs/xmh/tocutil.c
+++ b/xc/programs/xmh/tocutil.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: tocutil.c,v 2.59 94/12/01 17:15:50 kaleb Exp swick $
+ * $XConsortium: tocutil.c,v 2.60 95/01/09 16:52:53 swick Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/tocutil.h b/xc/programs/xmh/tocutil.h
index 3fd7d6470..475003b3d 100644
--- a/xc/programs/xmh/tocutil.h
+++ b/xc/programs/xmh/tocutil.h
@@ -1,4 +1,4 @@
-/* $XConsortium: tocutil.h,v 2.6 89/12/10 17:30:14 converse Exp swick $ */
+/* $XConsortium: tocutil.h,v 2.7 95/01/09 16:52:53 swick Exp $ */
/*
* COPYRIGHT 1987
* DIGITAL EQUIPMENT CORPORATION
diff --git a/xc/programs/xmh/tsource.c b/xc/programs/xmh/tsource.c
index 6b9b23618..67029bf00 100644
--- a/xc/programs/xmh/tsource.c
+++ b/xc/programs/xmh/tsource.c
@@ -1,4 +1,4 @@
-/* $XConsortium: tsource.c,v 2.23 91/07/05 18:56:14 converse Exp $ */
+/* $XConsortium: tsource.c,v 2.24 91/10/21 14:32:36 eswu Exp $ */
/*
* COPYRIGHT 1987
diff --git a/xc/programs/xmh/tsource.h b/xc/programs/xmh/tsource.h
index d3f1337c5..ca0f33ec7 100644
--- a/xc/programs/xmh/tsource.h
+++ b/xc/programs/xmh/tsource.h
@@ -1,4 +1,4 @@
-/* $XConsortium: tsource.h,v 1.2 91/07/23 18:38:31 converse Exp $ */
+/* $XConsortium: tsource.h,v 1.3 94/04/17 20:24:04 converse Exp $ */
/***********************************************************
diff --git a/xc/programs/xmh/tsourceP.h b/xc/programs/xmh/tsourceP.h
index 8644922b2..71582bda6 100644
--- a/xc/programs/xmh/tsourceP.h
+++ b/xc/programs/xmh/tsourceP.h
@@ -1,5 +1,5 @@
/*
-* $XConsortium: tsourceP.h,v 1.1 89/09/01 17:36:46 kit Exp $
+* $XConsortium: tsourceP.h,v 1.2 94/04/17 20:24:05 kit Exp $
*/
diff --git a/xc/programs/xmh/util.c b/xc/programs/xmh/util.c
index 9b2362957..04124aefc 100644
--- a/xc/programs/xmh/util.c
+++ b/xc/programs/xmh/util.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: util.c,v 2.44 94/03/30 19:55:04 gildea Exp gildea $
+ * $XConsortium: util.c,v 2.45 94/11/28 23:43:16 gildea Exp $
*
*
* COPYRIGHT 1987
diff --git a/xc/programs/xmh/version.h b/xc/programs/xmh/version.h
index 7641a6d49..e305415c1 100644
--- a/xc/programs/xmh/version.h
+++ b/xc/programs/xmh/version.h
@@ -1,4 +1,4 @@
-/* $XConsortium: version.h,v 1.3 95/01/10 15:59:31 swick Exp swick $ */
+/* $XConsortium: version.h,v 1.4 95/01/10 21:59:40 swick Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xmh/viewfuncs.c b/xc/programs/xmh/viewfuncs.c
index 42b5521c8..1ac9bc922 100644
--- a/xc/programs/xmh/viewfuncs.c
+++ b/xc/programs/xmh/viewfuncs.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: viewfuncs.c,v 2.22 91/07/17 21:25:48 converse Exp $
+ * $XConsortium: viewfuncs.c,v 2.23 92/04/08 12:18:41 rws Exp $
*
*
* COPYRIGHT 1987, 1989
diff --git a/xc/programs/xmh/xmh.h b/xc/programs/xmh/xmh.h
index 1d9b0121f..c72267a0a 100644
--- a/xc/programs/xmh/xmh.h
+++ b/xc/programs/xmh/xmh.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xmh.h,v 2.31 91/04/02 19:28:34 gildea Exp $
+ * $XConsortium: xmh.h,v 2.32 93/09/08 15:31:11 kaleb Exp $
*
*
* COPYRIGHT 1987
diff --git a/xc/programs/xmh/xmh.man b/xc/programs/xmh/xmh.man
index 257b24d6c..2aff56b08 100644
--- a/xc/programs/xmh/xmh.man
+++ b/xc/programs/xmh/xmh.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xmh.man,v 1.35 94/08/02 02:14:54 gildea Exp swick $
+.\" $XConsortium: xmh.man,v 1.36 95/01/18 19:58:03 swick Exp $
.\" Copyright (c) 1989, 1991, 1994 X Consortium
.\" Copyright 1988, 1989, Digital Equipment Corporation.
.\"
diff --git a/xc/programs/xmodmap/Imakefile b/xc/programs/xmodmap/Imakefile
index f2cc956e0..d75a81517 100644
--- a/xc/programs/xmodmap/Imakefile
+++ b/xc/programs/xmodmap/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.8 91/07/17 16:06:44 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.9 93/08/17 20:55:09 rws Exp $
DEPLIBS = $(DEPXONLYLIB)
LOCAL_LIBRARIES = $(XONLYLIB)
LINTLIBS = $(LINTXLIB)
diff --git a/xc/programs/xmodmap/exec.c b/xc/programs/xmodmap/exec.c
index 65f7a3ecf..9ab628b17 100644
--- a/xc/programs/xmodmap/exec.c
+++ b/xc/programs/xmodmap/exec.c
@@ -1,4 +1,4 @@
-/* $XConsortium: exec.c,v 1.12 91/07/18 10:25:57 rws Exp $ */
+/* $XConsortium: exec.c,v 1.13 94/04/17 20:24:20 rws Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xmodmap/handle.c b/xc/programs/xmodmap/handle.c
index c6e7a8327..399891bc7 100644
--- a/xc/programs/xmodmap/handle.c
+++ b/xc/programs/xmodmap/handle.c
@@ -1,4 +1,4 @@
-/* $XConsortium: handle.c,v 1.27 94/03/16 19:43:23 converse Exp $ */
+/* $XConsortium: handle.c,v 1.28 94/04/17 20:24:20 converse Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xmodmap/pf.c b/xc/programs/xmodmap/pf.c
index 617653fd7..684b725d9 100644
--- a/xc/programs/xmodmap/pf.c
+++ b/xc/programs/xmodmap/pf.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pf.c,v 1.4 91/07/17 22:26:40 rws Exp $ */
+/* $XConsortium: pf.c,v 1.5 94/04/17 20:24:21 rws Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xmodmap/wq.h b/xc/programs/xmodmap/wq.h
index b5ca41a66..83b3508b6 100644
--- a/xc/programs/xmodmap/wq.h
+++ b/xc/programs/xmodmap/wq.h
@@ -1,4 +1,4 @@
-/* $XConsortium: wq.h,v 1.4 88/10/08 15:41:34 jim Exp $ */
+/* $XConsortium: wq.h,v 1.5 94/04/17 20:24:22 jim Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xmodmap/xmodmap.c b/xc/programs/xmodmap/xmodmap.c
index 81b4edcdc..3b5197f58 100644
--- a/xc/programs/xmodmap/xmodmap.c
+++ b/xc/programs/xmodmap/xmodmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xmodmap.c,v 1.23 94/03/16 18:39:13 converse Exp $ */
+/* $XConsortium: xmodmap.c,v 1.24 94/04/17 20:24:24 converse Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xmodmap/xmodmap.h b/xc/programs/xmodmap/xmodmap.h
index f5241cedc..eba8bee2e 100644
--- a/xc/programs/xmodmap/xmodmap.h
+++ b/xc/programs/xmodmap/xmodmap.h
@@ -1,4 +1,4 @@
-/* $XConsortium: xmodmap.h,v 1.7 91/07/17 22:26:31 rws Exp $ */
+/* $XConsortium: xmodmap.h,v 1.8 94/04/17 20:24:25 rws Exp $ */
/*
Copyright (c) 1988 X Consortium
diff --git a/xc/programs/xmodmap/xmodmap.man b/xc/programs/xmodmap/xmodmap.man
index 2dc6185b9..ac6a64f8f 100644
--- a/xc/programs/xmodmap/xmodmap.man
+++ b/xc/programs/xmodmap/xmodmap.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xmodmap.man,v 1.23 94/04/14 15:09:31 dpw Exp $
+.\" $XConsortium: xmodmap.man,v 1.24 94/04/17 20:24:25 dpw Exp $
.\" Copyright (c) 1988, 1989, 1990 X Consortium
.\" Copyright 1987 Sun Microsystems, Inc.
.\"
diff --git a/xc/programs/xprop/Imakefile b/xc/programs/xprop/Imakefile
index 0bbcb4e10..0bceb6278 100644
--- a/xc/programs/xprop/Imakefile
+++ b/xc/programs/xprop/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.7 91/07/16 23:05:51 gildea Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
SRCS = xprop.c dsimple.c
diff --git a/xc/programs/xprop/dsimple.c b/xc/programs/xprop/dsimple.c
index a0ec77dd3..de8a5aceb 100644
--- a/xc/programs/xprop/dsimple.c
+++ b/xc/programs/xprop/dsimple.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.c,v 1.15 94/04/13 17:47:08 gildea Exp $ */
+/* $XConsortium: dsimple.c,v 1.16 94/04/17 20:24:42 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xprop/dsimple.h b/xc/programs/xprop/dsimple.h
index 28ae673db..f1209f14c 100644
--- a/xc/programs/xprop/dsimple.h
+++ b/xc/programs/xprop/dsimple.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.h,v 1.3 94/04/13 17:48:14 gildea Exp $ */
+/* $XConsortium: dsimple.h,v 1.4 94/04/17 20:24:43 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xprop/xprop.c b/xc/programs/xprop/xprop.c
index fcd1c6a32..ffbe2cb29 100644
--- a/xc/programs/xprop/xprop.c
+++ b/xc/programs/xprop/xprop.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xprop.c,v 1.42 94/03/27 14:37:44 rws Exp $*/
+/* $XConsortium: xprop.c,v 1.43 94/04/17 20:24:43 rws Exp $*/
/*
Copyright (c) 1990 X Consortium
diff --git a/xc/programs/xprop/xprop.man b/xc/programs/xprop/xprop.man
index 7abd210ba..0551a450d 100644
--- a/xc/programs/xprop/xprop.man
+++ b/xc/programs/xprop/xprop.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xprop.man,v 1.17 94/04/13 18:42:36 mor Exp $
+.\" $XConsortium: xprop.man,v 1.18 94/04/17 20:24:44 mor Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xrdb/Imakefile b/xc/programs/xrdb/Imakefile
index cfcd95fad..7eae50f84 100644
--- a/xc/programs/xrdb/Imakefile
+++ b/xc/programs/xrdb/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.7 91/07/17 00:46:42 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.8 92/09/14 18:53:12 rws Exp $
#if PatheticCpp
CPPDEFS = -DPATHETICCPP
#endif
diff --git a/xc/programs/xrdb/xrdb.c b/xc/programs/xrdb/xrdb.c
index 5eb0ca827..756b19652 100644
--- a/xc/programs/xrdb/xrdb.c
+++ b/xc/programs/xrdb/xrdb.c
@@ -1,7 +1,7 @@
/*
* xrdb - X resource manager database utility
*
- * $XConsortium: xrdb.c,v 11.75 94/03/27 14:42:02 rws Exp mor $
+ * $XConsortium: xrdb.c,v 11.76 95/05/12 18:36:46 mor Exp $
*/
/*
diff --git a/xc/programs/xrdb/xrdb.man b/xc/programs/xrdb/xrdb.man
index 1f5a325bc..0d23347d4 100644
--- a/xc/programs/xrdb/xrdb.man
+++ b/xc/programs/xrdb/xrdb.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xrdb.man,v 11.37 94/04/17 20:24:12 gildea Exp $
+.\" $XConsortium: xrdb.man,v 11.38 94/04/18 18:07:04 rws Exp $
.\" Copyright 1991, Digital Equipment Corporation.
.\" Copyright (c) 1991, 1994 X Consortium
.\"
diff --git a/xc/programs/xrefresh/Imakefile b/xc/programs/xrefresh/Imakefile
index fe8fcb32d..5c5ae1d4c 100644
--- a/xc/programs/xrefresh/Imakefile
+++ b/xc/programs/xrefresh/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.6 91/07/17 16:07:01 gildea Exp $
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XLIB)
diff --git a/xc/programs/xrefresh/xrefresh.c b/xc/programs/xrefresh/xrefresh.c
index 52e89a2b6..9081b4cb3 100644
--- a/xc/programs/xrefresh/xrefresh.c
+++ b/xc/programs/xrefresh/xrefresh.c
@@ -47,7 +47,7 @@ SOFTWARE.
******************************************************************/
/*
- * $XConsortium: xrefresh.c,v 1.13 90/12/13 08:26:33 rws Exp $
+ * $XConsortium: xrefresh.c,v 1.14 94/04/17 20:24:48 rws Exp $
*
* Kitchen sink version, useful for clearing small areas and flashing the
* screen.
diff --git a/xc/programs/xrefresh/xrefresh.man b/xc/programs/xrefresh/xrefresh.man
index 2fdadcbaf..7c8ec6d1e 100644
--- a/xc/programs/xrefresh/xrefresh.man
+++ b/xc/programs/xrefresh/xrefresh.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xrefresh.man,v 1.14 94/04/12 18:50:50 gildea Exp $
+.\" $XConsortium: xrefresh.man,v 1.15 94/04/17 20:24:49 gildea Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xset/Imakefile b/xc/programs/xset/Imakefile
index 9eac1d1ea..be90353fd 100644
--- a/xc/programs/xset/Imakefile
+++ b/xc/programs/xset/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.6 91/07/17 00:46:54 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.7 91/12/20 11:29:16 rws Exp $
DEFINES = ExtensionDefines
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
diff --git a/xc/programs/xset/xset.c b/xc/programs/xset/xset.c
index 6c97cfb4f..13c6e399a 100644
--- a/xc/programs/xset/xset.c
+++ b/xc/programs/xset/xset.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xset.c,v 1.69 95/05/12 16:36:37 mor Exp mor $
+ * $XConsortium: xset.c,v 1.70 95/05/12 17:22:03 mor Exp $
*/
/*
diff --git a/xc/programs/xset/xset.man b/xc/programs/xset/xset.man
index 6e2740549..a3a992b19 100644
--- a/xc/programs/xset/xset.man
+++ b/xc/programs/xset/xset.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xset.man,v 1.26 94/04/12 18:48:09 gildea Exp $
+.\" $XConsortium: xset.man,v 1.27 94/04/17 20:24:17 gildea Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xsetroot/Imakefile b/xc/programs/xsetroot/Imakefile
index 45720defb..e41c70861 100644
--- a/xc/programs/xsetroot/Imakefile
+++ b/xc/programs/xsetroot/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.8 91/07/16 23:05:43 gildea Exp $
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
SRCS = xsetroot.c
diff --git a/xc/programs/xsetroot/xsetroot.c b/xc/programs/xsetroot/xsetroot.c
index e3a95ca65..3a37c6da9 100644
--- a/xc/programs/xsetroot/xsetroot.c
+++ b/xc/programs/xsetroot/xsetroot.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xsetroot.c,v 1.22 93/09/15 17:39:17 hersh Exp $
+ * $XConsortium: xsetroot.c,v 1.23 94/04/17 20:24:34 hersh Exp $
*
Copyright (c) 1987, X Consortium
diff --git a/xc/programs/xsetroot/xsetroot.man b/xc/programs/xsetroot/xsetroot.man
index d747aa6e1..629881e8c 100644
--- a/xc/programs/xsetroot/xsetroot.man
+++ b/xc/programs/xsetroot/xsetroot.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xsetroot.man,v 1.15 94/04/12 18:46:37 gildea Exp $
+.\" $XConsortium: xsetroot.man,v 1.16 94/04/17 20:24:35 gildea Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xstdcmap/Imakefile b/xc/programs/xstdcmap/Imakefile
index 6c8cdf770..daf9d7b18 100644
--- a/xc/programs/xstdcmap/Imakefile
+++ b/xc/programs/xstdcmap/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.4 91/07/17 16:07:52 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.5 91/07/19 14:59:10 rws Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
SRCS = xstdcmap.c
diff --git a/xc/programs/xstdcmap/xstdcmap.c b/xc/programs/xstdcmap/xstdcmap.c
index 2fa6fc702..d18404397 100644
--- a/xc/programs/xstdcmap/xstdcmap.c
+++ b/xc/programs/xstdcmap/xstdcmap.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: xstdcmap.c,v 1.9 93/09/20 18:05:07 hersh Exp $
+ * $XConsortium: xstdcmap.c,v 1.10 94/04/17 20:38:44 hersh Exp $
*
*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xstdcmap/xstdcmap.man b/xc/programs/xstdcmap/xstdcmap.man
index b7d939249..da17051dd 100644
--- a/xc/programs/xstdcmap/xstdcmap.man
+++ b/xc/programs/xstdcmap/xstdcmap.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xstdcmap.man,v 1.11 94/04/17 20:38:44 gildea Exp $
+.\" $XConsortium: xstdcmap.man,v 1.12 94/05/27 13:52:10 converse Exp $
.\" Copyright (c) 1989, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xterm/Imakefile b/xc/programs/xterm/Imakefile
index ff4f5f45d..61aa258ed 100644
--- a/xc/programs/xterm/Imakefile
+++ b/xc/programs/xterm/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.61 94/03/18 12:37:27 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.62 94/04/10 16:02:56 rws Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
diff --git a/xc/programs/xterm/TekPrsTbl.c b/xc/programs/xterm/TekPrsTbl.c
index bcafe4d16..a7a725889 100644
--- a/xc/programs/xterm/TekPrsTbl.c
+++ b/xc/programs/xterm/TekPrsTbl.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: TekPrsTbl.c,v 1.7 91/05/29 18:06:16 gildea Exp gildea $
+ * $XConsortium: TekPrsTbl.c,v 1.8 95/06/08 23:20:39 gildea Exp $
*/
diff --git a/xc/programs/xterm/Tekparse.def b/xc/programs/xterm/Tekparse.def
index 94a3e1130..5ea9a63c9 100644
--- a/xc/programs/xterm/Tekparse.def
+++ b/xc/programs/xterm/Tekparse.def
@@ -1,5 +1,5 @@
#
-# $XConsortium$
+# $XConsortium: Tekparse.def,v 1.2 88/09/06 14:35:12 jim Exp $
#
# List of symbols that need to be defined for Tekparse.h. If you need to
# change any of the CASE_ macros, make the change here and rerun the command
diff --git a/xc/programs/xterm/Tekparse.h b/xc/programs/xterm/Tekparse.h
index 6990b967c..b43b6a53c 100644
--- a/xc/programs/xterm/Tekparse.h
+++ b/xc/programs/xterm/Tekparse.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: Tekparse.h,v 1.3 88/09/06 17:07:31 jim Exp $
+ * $XConsortium: Tekparse.h,v 1.4 91/01/06 12:46:47 rws Exp $
*/
/*
diff --git a/xc/programs/xterm/Tekproc.c b/xc/programs/xterm/Tekproc.c
index 6cf543369..2dea05bda 100644
--- a/xc/programs/xterm/Tekproc.c
+++ b/xc/programs/xterm/Tekproc.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: Tekproc.c,v 1.115 94/04/17 20:23:23 rws Exp kaleb $
+ * $XConsortium: Tekproc.c,v 1.116 95/04/05 19:58:57 kaleb Exp $
*
* Warning, there be crufty dragons here.
*/
diff --git a/xc/programs/xterm/VTPrsTbl.c b/xc/programs/xterm/VTPrsTbl.c
index 98986e385..dc795d3bc 100644
--- a/xc/programs/xterm/VTPrsTbl.c
+++ b/xc/programs/xterm/VTPrsTbl.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: VTPrsTbl.c,v 1.9 92/09/15 15:28:28 gildea Exp gildea $
+ * $XConsortium: VTPrsTbl.c,v 1.10 95/06/09 22:17:06 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/VTparse.def b/xc/programs/xterm/VTparse.def
index bbd7ea5bb..6b980416c 100644
--- a/xc/programs/xterm/VTparse.def
+++ b/xc/programs/xterm/VTparse.def
@@ -1,5 +1,5 @@
#
-# $XConsortium: VTparse.def,v 1.3 89/01/04 13:37:48 jim Exp $
+# $XConsortium: VTparse.def,v 1.4 92/09/15 15:28:31 gildea Exp $
#
# List of symbols that need to be defined for VTparse.h. If you need to
# change any of the CASE_ macros, make the change here and rerun the command
diff --git a/xc/programs/xterm/VTparse.h b/xc/programs/xterm/VTparse.h
index b3717436a..98cb97971 100644
--- a/xc/programs/xterm/VTparse.h
+++ b/xc/programs/xterm/VTparse.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: VTparse.h,v 1.5 91/01/06 12:47:08 rws Exp $
+ * $XConsortium: VTparse.h,v 1.6 92/09/15 15:28:31 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/XTerm.ad b/xc/programs/xterm/XTerm.ad
index 0436e9136..90b0fe2da 100644
--- a/xc/programs/xterm/XTerm.ad
+++ b/xc/programs/xterm/XTerm.ad
@@ -1,4 +1,4 @@
-! $XConsortium$
+! $XConsortium: XTerm.ad,v 1.32 94/02/09 18:19:21 converse Exp $
XTerm.JoinSession:False
*SimpleMenu*BackingStore: NotUseful
*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
diff --git a/xc/programs/xterm/button.c b/xc/programs/xterm/button.c
index 4e8964525..b737d52ce 100644
--- a/xc/programs/xterm/button.c
+++ b/xc/programs/xterm/button.c
@@ -1,4 +1,4 @@
-/* $XConsortium: button.c,v 1.68 93/09/20 17:42:33 hersh Exp $ */
+/* $XConsortium: button.c,v 1.69 94/04/02 12:41:50 gildea Exp $ */
/*
* Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
*
diff --git a/xc/programs/xterm/charproc.c b/xc/programs/xterm/charproc.c
index 8adea3b71..97ddb80f6 100644
--- a/xc/programs/xterm/charproc.c
+++ b/xc/programs/xterm/charproc.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: charproc.c,v 1.183 95/04/05 19:59:00 kaleb Exp kaleb $
+ * $XConsortium: charproc.c,v 1.184 95/08/24 20:50:56 kaleb Exp $
*/
/*
diff --git a/xc/programs/xterm/cursor.c b/xc/programs/xterm/cursor.c
index 67c4b68df..0da33d5bd 100644
--- a/xc/programs/xterm/cursor.c
+++ b/xc/programs/xterm/cursor.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: cursor.c,v 1.13 91/05/10 16:57:14 gildea Exp $
+ * $XConsortium: cursor.c,v 1.14 93/09/20 17:42:23 hersh Exp $
*/
/*
diff --git a/xc/programs/xterm/data.c b/xc/programs/xterm/data.c
index 2108096a1..6bcc263fa 100644
--- a/xc/programs/xterm/data.c
+++ b/xc/programs/xterm/data.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: data.c,v 1.11 93/02/25 17:21:27 gildea Exp kaleb $
+ * $XConsortium: data.c,v 1.12 95/04/05 19:58:47 kaleb Exp $
*/
/*
diff --git a/xc/programs/xterm/data.h b/xc/programs/xterm/data.h
index 15c4efc52..6ae9c075f 100644
--- a/xc/programs/xterm/data.h
+++ b/xc/programs/xterm/data.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: data.h,v 1.10 93/02/25 17:21:28 gildea Exp kaleb $
+ * $XConsortium: data.h,v 1.11 95/04/05 19:58:48 kaleb Exp $
*/
/*
* Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
diff --git a/xc/programs/xterm/error.h b/xc/programs/xterm/error.h
index 713e1eac6..53be5386f 100644
--- a/xc/programs/xterm/error.h
+++ b/xc/programs/xterm/error.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: error.h,v 1.8 91/07/17 17:43:54 rws Exp $
+ * $XConsortium: error.h,v 1.9 93/02/25 17:21:29 gildea Exp $
*/
diff --git a/xc/programs/xterm/input.c b/xc/programs/xterm/input.c
index 52038eb45..7beb51131 100644
--- a/xc/programs/xterm/input.c
+++ b/xc/programs/xterm/input.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: input.c,v 1.17 92/03/20 17:43:06 gildea Exp $
+ * $XConsortium: input.c,v 1.18 94/05/14 15:53:34 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/main.c b/xc/programs/xterm/main.c
index 5edd76e75..89576d935 100644
--- a/xc/programs/xterm/main.c
+++ b/xc/programs/xterm/main.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char *rid="$XConsortium: main.c,v 1.230 95/06/08 21:08:14 gildea Exp kaleb $";
+static char *rid="$XConsortium: main.c,v 1.231 95/09/13 14:48:31 kaleb Exp $";
#endif /* lint */
/*
diff --git a/xc/programs/xterm/main.h b/xc/programs/xterm/main.h
index aab52cb2d..59d304078 100644
--- a/xc/programs/xterm/main.h
+++ b/xc/programs/xterm/main.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: main.h,v 1.4 91/01/06 12:47:57 rws Exp $
+ * $XConsortium: main.h,v 1.5 91/02/06 16:00:15 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/menu.c b/xc/programs/xterm/menu.c
index 8541a0a55..9ad872d74 100644
--- a/xc/programs/xterm/menu.c
+++ b/xc/programs/xterm/menu.c
@@ -1,4 +1,4 @@
-/* $XConsortium: menu.c,v 1.62 93/02/25 17:21:30 gildea Exp $ */
+/* $XConsortium: menu.c,v 1.63 94/04/17 20:23:30 gildea Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xterm/menu.h b/xc/programs/xterm/menu.h
index 4fa728d0e..1a0853621 100644
--- a/xc/programs/xterm/menu.h
+++ b/xc/programs/xterm/menu.h
@@ -1,4 +1,4 @@
-/* $XConsortium: menu.h,v 1.24 93/02/25 17:21:31 gildea Exp $ */
+/* $XConsortium: menu.h,v 1.25 94/04/17 20:23:31 gildea Exp $ */
/*
Copyright (c) 1989 X Consortium
diff --git a/xc/programs/xterm/misc.c b/xc/programs/xterm/misc.c
index 3451e0364..88648a2b2 100644
--- a/xc/programs/xterm/misc.c
+++ b/xc/programs/xterm/misc.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: misc.c,v 1.102 94/03/28 18:27:08 gildea Exp gildea $
+ * $XConsortium: misc.c,v 1.103 94/11/28 23:45:52 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/ptyx.h b/xc/programs/xterm/ptyx.h
index d6675a530..b01906474 100644
--- a/xc/programs/xterm/ptyx.h
+++ b/xc/programs/xterm/ptyx.h
@@ -1,5 +1,5 @@
/*
- * $XConsortium: ptyx.h,v 1.62 1993/02/25 17:21:26 gildea Exp converse $
+ * $XConsortium: ptyx.h,v 1.63 94/08/02 19:24:44 converse Exp $
*/
/*
diff --git a/xc/programs/xterm/resize.c b/xc/programs/xterm/resize.c
index 3c3600772..eccf1a4b4 100644
--- a/xc/programs/xterm/resize.c
+++ b/xc/programs/xterm/resize.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: resize.c,v 1.33 95/04/07 18:59:30 kaleb Exp gildea $
+ * $XConsortium: resize.c,v 1.34 95/05/24 22:12:04 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/resize.man b/xc/programs/xterm/resize.man
index a14b9e99d..411e29f3f 100644
--- a/xc/programs/xterm/resize.man
+++ b/xc/programs/xterm/resize.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: resize.man,v 1.9 94/04/12 16:06:05 gildea Exp $
+.\" $XConsortium: resize.man,v 1.10 94/04/17 20:23:32 gildea Exp $
.TH RESIZE 1 "Release 6" "X Version 11"
.SH NAME
resize \- set TERMCAP and terminal settings to current xterm window size
diff --git a/xc/programs/xterm/screen.c b/xc/programs/xterm/screen.c
index 07172c09b..37715b162 100644
--- a/xc/programs/xterm/screen.c
+++ b/xc/programs/xterm/screen.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: screen.c,v 1.32 93/09/20 17:42:26 hersh Exp $
+ * $XConsortium: screen.c,v 1.33 94/04/02 17:34:36 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/scrollbar.c b/xc/programs/xterm/scrollbar.c
index 9882edbad..904a49666 100644
--- a/xc/programs/xterm/scrollbar.c
+++ b/xc/programs/xterm/scrollbar.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: scrollbar.c,v 1.43 93/09/20 17:42:21 hersh Exp $
+ * $XConsortium: scrollbar.c,v 1.44 94/04/02 12:42:01 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/tabs.c b/xc/programs/xterm/tabs.c
index aeb1df1cd..ae2ea103e 100644
--- a/xc/programs/xterm/tabs.c
+++ b/xc/programs/xterm/tabs.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: tabs.c,v 1.3 91/01/06 12:48:37 rws Exp $
+ * $XConsortium: tabs.c,v 1.4 91/05/06 17:12:18 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/termcap b/xc/programs/xterm/termcap
index 662093fb9..37f589006 100644
--- a/xc/programs/xterm/termcap
+++ b/xc/programs/xterm/termcap
@@ -1,4 +1,4 @@
-# $XConsortium: termcap,v 1.12 94/04/12 15:01:29 gildea Exp gildea $
+# $XConsortium: termcap,v 1.13 94/10/13 21:24:32 gildea Exp $
#
vs|xterm|xterm-24|xterms|vs100|xterm terminal emulator (X Window System):\
:is=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:\
diff --git a/xc/programs/xterm/terminfo b/xc/programs/xterm/terminfo
index 3a2f5e4b6..a77158993 100644
--- a/xc/programs/xterm/terminfo
+++ b/xc/programs/xterm/terminfo
@@ -1,4 +1,4 @@
-# $XConsortium: terminfo,v 1.10 94/04/13 11:43:14 gildea Exp gildea $
+# $XConsortium: terminfo,v 1.11 94/10/13 21:24:31 gildea Exp $
# meml locks memory above the cursor; memu unlocks (ala HP terminals)
#
xterm|xterm-24|xterms|vs100|xterm terminal emulator (X Window System),
diff --git a/xc/programs/xterm/util.c b/xc/programs/xterm/util.c
index 6c138feca..1641395f1 100644
--- a/xc/programs/xterm/util.c
+++ b/xc/programs/xterm/util.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: util.c,v 1.30 91/06/18 11:08:38 gildea Exp $
+ * $XConsortium: util.c,v 1.31 91/06/20 18:34:47 gildea Exp $
*/
/*
diff --git a/xc/programs/xterm/xterm.man b/xc/programs/xterm/xterm.man
index 0ee22c845..02fdbac2a 100644
--- a/xc/programs/xterm/xterm.man
+++ b/xc/programs/xterm/xterm.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xterm.man,v 1.80 94/04/17 19:01:03 rws Exp gildea $
+.\" $XConsortium: xterm.man,v 1.81 95/05/05 19:26:52 gildea Exp $
.\" Copyright (c) 1989 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xwd/Imakefile b/xc/programs/xwd/Imakefile
index cdaf5691c..5375e0e5d 100644
--- a/xc/programs/xwd/Imakefile
+++ b/xc/programs/xwd/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium$
+XCOMM $XConsortium: Imakefile,v 1.7 91/07/17 00:46:21 gildea Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
SRCS = xwd.c dsimple.c
diff --git a/xc/programs/xwd/dsimple.c b/xc/programs/xwd/dsimple.c
index e79be4772..b06e431cf 100644
--- a/xc/programs/xwd/dsimple.c
+++ b/xc/programs/xwd/dsimple.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.c,v 1.15 94/04/13 17:30:51 gildea Exp $ */
+/* $XConsortium: dsimple.c,v 1.16 94/04/17 20:23:56 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xwd/dsimple.h b/xc/programs/xwd/dsimple.h
index fbc349eab..9cf626d85 100644
--- a/xc/programs/xwd/dsimple.h
+++ b/xc/programs/xwd/dsimple.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.h,v 1.4 94/04/13 17:32:49 gildea Exp $ */
+/* $XConsortium: dsimple.h,v 1.5 94/04/17 20:23:56 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xwd/xwd.c b/xc/programs/xwd/xwd.c
index 77c15d838..76d9030bc 100644
--- a/xc/programs/xwd/xwd.c
+++ b/xc/programs/xwd/xwd.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xwd.c,v 1.61 93/09/29 17:49:06 rws Exp $ */
+/* $XConsortium: xwd.c,v 1.62 94/04/17 20:23:57 rws Exp $ */
/*
diff --git a/xc/programs/xwd/xwd.man b/xc/programs/xwd/xwd.man
index d4645a00c..2b8e8dcd7 100644
--- a/xc/programs/xwd/xwd.man
+++ b/xc/programs/xwd/xwd.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xwd.man,v 1.17 94/04/12 18:40:16 gildea Exp $
+.\" $XConsortium: xwd.man,v 1.18 94/04/17 20:23:58 gildea Exp $
.\" Copyright (c) 1988, 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xwininfo/Imakefile b/xc/programs/xwininfo/Imakefile
index b641b1e6c..9581f1037 100644
--- a/xc/programs/xwininfo/Imakefile
+++ b/xc/programs/xwininfo/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.8 91/07/17 00:47:28 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.9 92/11/20 13:24:14 rws Exp $
DEPLIBS = $(DEPXMULIB) $(DEPXLIB)
LOCAL_LIBRARIES = $(XMULIB) $(XLIB)
SRCS = xwininfo.c dsimple.c
diff --git a/xc/programs/xwininfo/dsimple.c b/xc/programs/xwininfo/dsimple.c
index c8cf61eb5..76221d94d 100644
--- a/xc/programs/xwininfo/dsimple.c
+++ b/xc/programs/xwininfo/dsimple.c
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.c,v 1.15 94/04/13 17:44:52 gildea Exp $ */
+/* $XConsortium: dsimple.c,v 1.16 94/04/17 20:24:39 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xwininfo/dsimple.h b/xc/programs/xwininfo/dsimple.h
index 3846f78e2..68a46de3a 100644
--- a/xc/programs/xwininfo/dsimple.h
+++ b/xc/programs/xwininfo/dsimple.h
@@ -1,4 +1,4 @@
-/* $XConsortium: dsimple.h,v 1.3 94/04/13 17:45:52 gildea Exp $ */
+/* $XConsortium: dsimple.h,v 1.4 94/04/17 20:24:39 gildea Exp $ */
/*
Copyright (c) 1993 X Consortium
diff --git a/xc/programs/xwininfo/xwininfo.c b/xc/programs/xwininfo/xwininfo.c
index 5a93036bb..a02d57a0b 100644
--- a/xc/programs/xwininfo/xwininfo.c
+++ b/xc/programs/xwininfo/xwininfo.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xwininfo.c,v 1.54 94/03/27 15:35:16 rws Exp $ */
+/* $XConsortium: xwininfo.c,v 1.55 94/04/17 20:24:40 rws Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/xc/programs/xwininfo/xwininfo.man b/xc/programs/xwininfo/xwininfo.man
index 4a0f48536..e9ecf2551 100644
--- a/xc/programs/xwininfo/xwininfo.man
+++ b/xc/programs/xwininfo/xwininfo.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xwininfo.man,v 1.21 94/04/12 18:38:22 gildea Exp $
+.\" $XConsortium: xwininfo.man,v 1.22 94/04/17 20:24:41 gildea Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
diff --git a/xc/programs/xwud/Imakefile b/xc/programs/xwud/Imakefile
index 8dbe286aa..06733c9cd 100644
--- a/xc/programs/xwud/Imakefile
+++ b/xc/programs/xwud/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XConsortium: Imakefile,v 1.7 91/07/17 00:47:15 gildea Exp $
+XCOMM $XConsortium: Imakefile,v 1.8 93/08/19 09:35:34 rws Exp $
DEPLIBS = $(DEPXONLYLIB)
LOCAL_LIBRARIES = $(XONLYLIB)
diff --git a/xc/programs/xwud/xwud.c b/xc/programs/xwud/xwud.c
index 39723487d..f82a05d18 100644
--- a/xc/programs/xwud/xwud.c
+++ b/xc/programs/xwud/xwud.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xwud.c,v 1.57 94/03/27 15:44:05 rws Exp $ */
+/* $XConsortium: xwud.c,v 1.58 94/04/17 20:24:32 rws Exp $ */
/*
Copyright (c) 1985, 1986, 1988 X Consortium
diff --git a/xc/programs/xwud/xwud.man b/xc/programs/xwud/xwud.man
index b847b6d75..d89a82909 100644
--- a/xc/programs/xwud/xwud.man
+++ b/xc/programs/xwud/xwud.man
@@ -1,4 +1,4 @@
-.\" $XConsortium: xwud.man,v 1.15 94/04/12 18:36:16 gildea Exp $
+.\" $XConsortium: xwud.man,v 1.16 94/04/17 20:24:33 gildea Exp $
.\" Copyright (c) 1988 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining