summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEgbert Eich <eich@freedesktop.org>2004-03-04 17:45:54 +0000
committerEgbert Eich <eich@freedesktop.org>2004-03-04 17:45:54 +0000
commit9e4e9b2d737bea7ff81f4fe69dff02274175a5d9 (patch)
treed34ef3a4bdcafd29c0d88bcb0766f3c0f49e869f /src
parent48e9a236cab6cb987f67ad596c4412c215d7a98b (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src')
-rw-r--r--src/AllPlanes.c2
-rw-r--r--src/AllowEv.c2
-rw-r--r--src/AutoRep.c2
-rw-r--r--src/Backgnd.c2
-rw-r--r--src/BdrWidth.c2
-rw-r--r--src/Bell.c2
-rw-r--r--src/Border.c2
-rw-r--r--src/ChAccCon.c2
-rw-r--r--src/ChActPGb.c2
-rw-r--r--src/ChClMode.c2
-rw-r--r--src/ChCmap.c2
-rw-r--r--src/ChGC.c2
-rw-r--r--src/ChKeyCon.c2
-rw-r--r--src/ChPntCon.c2
-rw-r--r--src/ChProp.c2
-rw-r--r--src/ChSaveSet.c2
-rw-r--r--src/ChWAttrs.c2
-rw-r--r--src/ChWindow.c2
-rw-r--r--src/ChkIfEv.c2
-rw-r--r--src/ChkMaskEv.c2
-rw-r--r--src/ChkTypEv.c2
-rw-r--r--src/ChkTypWEv.c2
-rw-r--r--src/ChkWinEv.c2
-rw-r--r--src/CirWin.c2
-rw-r--r--src/CirWinDn.c2
-rw-r--r--src/CirWinUp.c2
-rw-r--r--src/ClDisplay.c2
-rw-r--r--src/Clear.c2
-rw-r--r--src/ClearArea.c2
-rw-r--r--src/Cmap.h11
-rw-r--r--src/ConfWind.c2
-rw-r--r--src/ConnDis.c4
-rw-r--r--src/Context.c2
-rw-r--r--src/ConvSel.c2
-rw-r--r--src/CopyArea.c2
-rw-r--r--src/CopyCmap.c2
-rw-r--r--src/CopyGC.c2
-rw-r--r--src/CopyPlane.c2
-rw-r--r--src/Cr.h28
-rw-r--r--src/CrBFData.c2
-rw-r--r--src/CrCmap.c2
-rw-r--r--src/CrCursor.c2
-rw-r--r--src/CrGC.c2
-rw-r--r--src/CrGlCur.c2
-rw-r--r--src/CrPixmap.c2
-rw-r--r--src/Cursor.c2
-rw-r--r--src/DefCursor.c2
-rw-r--r--src/DelProp.c2
-rw-r--r--src/DestSubs.c2
-rw-r--r--src/DestWind.c2
-rw-r--r--src/DisName.c2
-rw-r--r--src/DrArc.c2
-rw-r--r--src/DrArcs.c2
-rw-r--r--src/DrLine.c2
-rw-r--r--src/DrLines.c2
-rw-r--r--src/DrPoint.c2
-rw-r--r--src/DrPoints.c2
-rw-r--r--src/DrRect.c2
-rw-r--r--src/DrRects.c2
-rw-r--r--src/DrSegs.c2
-rw-r--r--src/ErrDes.c2
-rw-r--r--src/ErrHndlr.c2
-rw-r--r--src/EvToWire.c2
-rw-r--r--src/FSSaver.c2
-rw-r--r--src/FSWrap.c2
-rw-r--r--src/FillArc.c2
-rw-r--r--src/FillArcs.c2
-rw-r--r--src/FillPoly.c2
-rw-r--r--src/FillRct.c2
-rw-r--r--src/FillRcts.c2
-rw-r--r--src/FilterEv.c2
-rw-r--r--src/Flush.c2
-rw-r--r--src/Font.c2
-rw-r--r--src/FontInfo.c2
-rw-r--r--src/FontNames.c2
-rw-r--r--src/FreeCmap.c2
-rw-r--r--src/FreeCols.c2
-rw-r--r--src/FreeCurs.c2
-rw-r--r--src/FreeEData.c2
-rw-r--r--src/FreeGC.c2
-rw-r--r--src/FreePix.c2
-rw-r--r--src/GCMisc.c2
-rw-r--r--src/Geom.c2
-rw-r--r--src/GetAtomNm.c2
-rw-r--r--src/GetColor.c2
-rw-r--r--src/GetDflt.c2
-rw-r--r--src/GetFPath.c2
-rw-r--r--src/GetHints.c2
-rw-r--r--src/GetIFocus.c2
-rw-r--r--src/GetImage.c2
-rw-r--r--src/GetKCnt.c2
-rw-r--r--src/GetPCnt.c2
-rw-r--r--src/GetPntMap.c2
-rw-r--r--src/GetProp.c2
-rw-r--r--src/GetSSaver.c2
-rw-r--r--src/GetWAttrs.c2
-rw-r--r--src/GrButton.c2
-rw-r--r--src/GrKey.c2
-rw-r--r--src/GrServer.c2
-rw-r--r--src/Host.c2
-rw-r--r--src/IfEvent.c2
-rw-r--r--src/ImText.c2
-rw-r--r--src/ImText16.c2
-rw-r--r--src/ImUtil.c2
-rw-r--r--src/InitExt.c2
-rw-r--r--src/InsCmap.c2
-rw-r--r--src/IntAtom.c2
-rw-r--r--src/Key.h18
-rw-r--r--src/KeyBind.c2
-rw-r--r--src/KeysymStr.c2
-rw-r--r--src/KillCl.c2
-rw-r--r--src/LiICmaps.c2
-rw-r--r--src/LiProps.c2
-rw-r--r--src/ListExt.c2
-rw-r--r--src/LoadFont.c2
-rw-r--r--src/LockDis.c2
-rw-r--r--src/LookupCol.c2
-rw-r--r--src/LowerWin.c2
-rw-r--r--src/Macros.c2
-rw-r--r--src/MapRaised.c2
-rw-r--r--src/MapSubs.c2
-rw-r--r--src/MapWindow.c2
-rw-r--r--src/MaskEvent.c2
-rw-r--r--src/Misc.c2
-rw-r--r--src/ModMap.c2
-rw-r--r--src/MoveWin.c2
-rw-r--r--src/NextEvent.c2
-rw-r--r--src/OCWrap.c2
-rw-r--r--src/OMWrap.c2
-rw-r--r--src/OpenDis.c2
-rw-r--r--src/ParseCmd.c2
-rw-r--r--src/ParseCol.c2
-rw-r--r--src/ParseGeom.c2
-rw-r--r--src/PeekEvent.c2
-rw-r--r--src/PeekIfEv.c2
-rw-r--r--src/PmapBgnd.c2
-rw-r--r--src/PmapBord.c2
-rw-r--r--src/PolyReg.c2
-rw-r--r--src/PolyTxt.c2
-rw-r--r--src/PolyTxt16.c2
-rw-r--r--src/PropAlloc.c2
-rw-r--r--src/PutBEvent.c2
-rw-r--r--src/PutImage.c2
-rw-r--r--src/QuColor.c2
-rw-r--r--src/QuColors.c2
-rw-r--r--src/QuExt.c2
-rw-r--r--src/QuKeybd.c2
-rw-r--r--src/QuTextE16.c2
-rw-r--r--src/QuTextExt.c2
-rw-r--r--src/QuTree.c2
-rw-r--r--src/Quarks.c2
-rw-r--r--src/RaiseWin.c2
-rw-r--r--src/RdBitF.c2
-rw-r--r--src/RecolorC.c2
-rw-r--r--src/ReconfWin.c2
-rw-r--r--src/Region.c2
-rw-r--r--src/RegstFlt.c2
-rw-r--r--src/RepWindow.c2
-rw-r--r--src/RestackWs.c2
-rw-r--r--src/RotProp.c2
-rw-r--r--src/SelInput.c2
-rw-r--r--src/SendEvent.c2
-rw-r--r--src/SetBack.c2
-rw-r--r--src/SetCRects.c2
-rw-r--r--src/SetClMask.c2
-rw-r--r--src/SetClOrig.c2
-rw-r--r--src/SetDashes.c2
-rw-r--r--src/SetFPath.c2
-rw-r--r--src/SetFont.c2
-rw-r--r--src/SetFore.c2
-rw-r--r--src/SetFunc.c2
-rw-r--r--src/SetHints.c2
-rw-r--r--src/SetIFocus.c2
-rw-r--r--src/SetLStyle.c2
-rw-r--r--src/SetLocale.c4
-rw-r--r--src/SetPMask.c2
-rw-r--r--src/SetPntMap.c2
-rw-r--r--src/SetSOwner.c2
-rw-r--r--src/SetSSaver.c2
-rw-r--r--src/SetState.c2
-rw-r--r--src/SetStip.c2
-rw-r--r--src/SetTSOrig.c2
-rw-r--r--src/SetTile.c2
-rw-r--r--src/StBytes.c2
-rw-r--r--src/StColor.c2
-rw-r--r--src/StColors.c2
-rw-r--r--src/StNColor.c2
-rw-r--r--src/StName.c2
-rw-r--r--src/StrKeysym.c2
-rw-r--r--src/Sync.c2
-rw-r--r--src/Synchro.c2
-rw-r--r--src/Text.c2
-rw-r--r--src/Text16.c2
-rw-r--r--src/TextExt.c2
-rw-r--r--src/TextExt16.c2
-rw-r--r--src/TextToStr.c2
-rw-r--r--src/UIThrStubs.c2
-rw-r--r--src/UndefCurs.c2
-rw-r--r--src/UngrabBut.c2
-rw-r--r--src/UngrabKbd.c2
-rw-r--r--src/UngrabKey.c2
-rw-r--r--src/UngrabPtr.c2
-rw-r--r--src/UngrabSvr.c2
-rw-r--r--src/UninsCmap.c2
-rw-r--r--src/UnldFont.c2
-rw-r--r--src/UnmapSubs.c2
-rw-r--r--src/UnmapWin.c2
-rw-r--r--src/WMGeom.c2
-rw-r--r--src/WMProps.c2
-rw-r--r--src/WarpPtr.c2
-rw-r--r--src/WinEvent.c2
-rw-r--r--src/Window.c2
-rw-r--r--src/WrBitF.c2
-rw-r--r--src/XErrorDB2
-rw-r--r--src/XKeysymDB2
-rw-r--r--src/Xintatom.h2
-rw-r--r--src/Xintconn.h2
-rw-r--r--src/XlibInt.c2
-rw-r--r--src/XomGeneric.h2
-rw-r--r--src/Xresinternal.h15
-rw-r--r--src/Xrm.c2
-rw-r--r--src/evtomask.c2
-rw-r--r--src/globals.c2
-rw-r--r--src/imConv.c2
-rw-r--r--src/locking.c2
-rw-r--r--src/locking.h2
-rw-r--r--src/os2Stubs.c2
-rw-r--r--src/udcInf.c2
-rw-r--r--src/util/makekeys.c2
-rw-r--r--src/xcms/AddDIC.c2
-rw-r--r--src/xcms/AddSF.c2
-rw-r--r--src/xcms/CCC.c2
-rw-r--r--src/xcms/Cv.h190
-rw-r--r--src/xcms/CvColW.c2
-rw-r--r--src/xcms/CvCols.c2
-rw-r--r--src/xcms/HVC.c4
-rw-r--r--src/xcms/HVCGcC.c2
-rw-r--r--src/xcms/HVCGcV.c2
-rw-r--r--src/xcms/HVCGcVC.c2
-rw-r--r--src/xcms/HVCMnV.c2
-rw-r--r--src/xcms/HVCMxC.c2
-rw-r--r--src/xcms/HVCMxV.c2
-rw-r--r--src/xcms/HVCMxVC.c2
-rw-r--r--src/xcms/HVCMxVs.c2
-rw-r--r--src/xcms/HVCWpAj.c2
-rw-r--r--src/xcms/IdOfPr.c2
-rw-r--r--src/xcms/LRGB.c2
-rw-r--r--src/xcms/Lab.c2
-rw-r--r--src/xcms/LabGcC.c2
-rw-r--r--src/xcms/LabGcL.c2
-rw-r--r--src/xcms/LabGcLC.c2
-rw-r--r--src/xcms/LabMnL.c2
-rw-r--r--src/xcms/LabMxC.c2
-rw-r--r--src/xcms/LabMxL.c2
-rw-r--r--src/xcms/LabMxLC.c2
-rw-r--r--src/xcms/LabWpAj.c2
-rw-r--r--src/xcms/Luv.c2
-rw-r--r--src/xcms/LuvGcC.c2
-rw-r--r--src/xcms/LuvGcL.c2
-rw-r--r--src/xcms/LuvGcLC.c2
-rw-r--r--src/xcms/LuvMnL.c2
-rw-r--r--src/xcms/LuvMxC.c2
-rw-r--r--src/xcms/LuvMxL.c2
-rw-r--r--src/xcms/LuvMxLC.c2
-rw-r--r--src/xcms/LuvWpAj.c2
-rw-r--r--src/xcms/PrOfId.c2
-rw-r--r--src/xcms/QuCol.c2
-rw-r--r--src/xcms/QuCols.c2
-rw-r--r--src/xcms/SetCCC.c2
-rw-r--r--src/xcms/SetGetCols.c2
-rw-r--r--src/xcms/StCol.c2
-rw-r--r--src/xcms/StCols.c2
-rw-r--r--src/xcms/UNDEFINED.c2
-rw-r--r--src/xcms/XRGB.c2
-rw-r--r--src/xcms/XYZ.c2
-rw-r--r--src/xcms/Xcms.txt2
-rw-r--r--src/xcms/Xcmsint.h2
-rw-r--r--src/xcms/cmsAllCol.c2
-rw-r--r--src/xcms/cmsAllNCol.c2
-rw-r--r--src/xcms/cmsCmap.c2
-rw-r--r--src/xcms/cmsColNm.c4
-rw-r--r--src/xcms/cmsGlobls.c2
-rw-r--r--src/xcms/cmsInt.c2
-rw-r--r--src/xcms/cmsLkCol.c2
-rw-r--r--src/xcms/cmsMath.c2
-rw-r--r--src/xcms/cmsProp.c2
-rw-r--r--src/xcms/cmsTrig.c2
-rw-r--r--src/xcms/uvY.c2
-rw-r--r--src/xcms/xyY.c2
-rw-r--r--src/xkb/XKB.c2
-rw-r--r--src/xkb/XKBAlloc.c2
-rw-r--r--src/xkb/XKBBell.c2
-rw-r--r--src/xkb/XKBBind.c2
-rw-r--r--src/xkb/XKBCompat.c2
-rw-r--r--src/xkb/XKBCtrls.c2
-rw-r--r--src/xkb/XKBCvt.c2
-rw-r--r--src/xkb/XKBExtDev.c2
-rw-r--r--src/xkb/XKBGAlloc.c2
-rw-r--r--src/xkb/XKBGeom.c2
-rw-r--r--src/xkb/XKBGetByName.c2
-rw-r--r--src/xkb/XKBGetMap.c2
-rw-r--r--src/xkb/XKBList.c2
-rw-r--r--src/xkb/XKBMAlloc.c2
-rw-r--r--src/xkb/XKBMisc.c2
-rw-r--r--src/xkb/XKBNames.c2
-rw-r--r--src/xkb/XKBRdBuf.c2
-rw-r--r--src/xkb/XKBSetGeom.c2
-rw-r--r--src/xkb/XKBSetMap.c2
-rw-r--r--src/xkb/XKBUse.c2
-rw-r--r--src/xkb/XKBleds.c2
-rw-r--r--src/xkb/XKBlibint.h2
-rw-r--r--src/xlibi18n/ICWrap.c2
-rw-r--r--src/xlibi18n/IMWrap.c2
-rw-r--r--src/xlibi18n/XDefaultIMIF.c2
-rw-r--r--src/xlibi18n/XDefaultOMIF.c2
-rw-r--r--src/xlibi18n/XimImSw.h2
-rw-r--r--src/xlibi18n/XimThai.h2
-rw-r--r--src/xlibi18n/XimTrInt.h2
-rw-r--r--src/xlibi18n/XimTrX.h2
-rw-r--r--src/xlibi18n/XimTrans.h2
-rw-r--r--src/xlibi18n/Ximint.h2
-rw-r--r--src/xlibi18n/XimintL.h2
-rw-r--r--src/xlibi18n/XimintP.h2
-rw-r--r--src/xlibi18n/XlcDL.c4
-rw-r--r--src/xlibi18n/XlcGeneric.h2
-rw-r--r--src/xlibi18n/XlcPubI.h2
-rw-r--r--src/xlibi18n/XlcPublic.h2
-rw-r--r--src/xlibi18n/XlcSL.c2
-rw-r--r--src/xlibi18n/Xlcint.h2
-rw-r--r--src/xlibi18n/imKStoUCS.c2
-rw-r--r--src/xlibi18n/lcCT.c2
-rw-r--r--src/xlibi18n/lcCharSet.c2
-rw-r--r--src/xlibi18n/lcConv.c2
-rw-r--r--src/xlibi18n/lcDB.c2
-rw-r--r--src/xlibi18n/lcDynamic.c2
-rw-r--r--src/xlibi18n/lcFile.c2
-rw-r--r--src/xlibi18n/lcGeneric.c2
-rw-r--r--src/xlibi18n/lcInit.c2
-rw-r--r--src/xlibi18n/lcPrTxt.c2
-rw-r--r--src/xlibi18n/lcPubWrap.c2
-rw-r--r--src/xlibi18n/lcPublic.c2
-rw-r--r--src/xlibi18n/lcRM.c2
-rw-r--r--src/xlibi18n/lcStd.c2
-rw-r--r--src/xlibi18n/lcTxtPr.c2
-rw-r--r--src/xlibi18n/lcUTF8.c2
-rw-r--r--src/xlibi18n/lcUniConv/8bit_tab_to_h.c2
-rw-r--r--src/xlibi18n/lcUniConv/README2
-rw-r--r--src/xlibi18n/lcUniConv/armscii_8.h2
-rw-r--r--src/xlibi18n/lcUniConv/ascii.h2
-rw-r--r--src/xlibi18n/lcUniConv/big5.h2
-rw-r--r--src/xlibi18n/lcUniConv/big5_emacs.h2
-rw-r--r--src/xlibi18n/lcUniConv/cjk_tab_to_h.c2
-rw-r--r--src/xlibi18n/lcUniConv/cp1133.h2
-rw-r--r--src/xlibi18n/lcUniConv/cp1251.h2
-rw-r--r--src/xlibi18n/lcUniConv/cp1255.h2
-rw-r--r--src/xlibi18n/lcUniConv/cp1256.h2
-rw-r--r--src/xlibi18n/lcUniConv/gb2312.h2
-rw-r--r--src/xlibi18n/lcUniConv/georgian_academy.h2
-rw-r--r--src/xlibi18n/lcUniConv/georgian_ps.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_1.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_10.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_11.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_13.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_14.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_15.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_16.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_2.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_3.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_4.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_5.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_6.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_7.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_8.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_9.h2
-rw-r--r--src/xlibi18n/lcUniConv/iso8859_9e.h2
-rw-r--r--src/xlibi18n/lcUniConv/jisx0201.h2
-rw-r--r--src/xlibi18n/lcUniConv/jisx0208.h2
-rw-r--r--src/xlibi18n/lcUniConv/jisx0212.h2
-rw-r--r--src/xlibi18n/lcUniConv/koi8_c.h2
-rw-r--r--src/xlibi18n/lcUniConv/koi8_r.h2
-rw-r--r--src/xlibi18n/lcUniConv/koi8_u.h2
-rw-r--r--src/xlibi18n/lcUniConv/ksc5601.h2
-rw-r--r--src/xlibi18n/lcUniConv/mulelao.h2
-rw-r--r--src/xlibi18n/lcUniConv/tatar_cyr.h2
-rw-r--r--src/xlibi18n/lcUniConv/tcvn.h2
-rw-r--r--src/xlibi18n/lcUniConv/tis620.h2
-rw-r--r--src/xlibi18n/lcUniConv/ucs2be.h2
-rw-r--r--src/xlibi18n/lcUniConv/utf8.h2
-rw-r--r--src/xlibi18n/lcUniConv/viscii.h2
-rw-r--r--src/xlibi18n/lcUtil.c2
-rw-r--r--src/xlibi18n/lcWrap.c2
-rw-r--r--src/xlibi18n/mbWMProps.c2
-rw-r--r--src/xlibi18n/mbWrap.c2
-rw-r--r--src/xlibi18n/utf8WMProps.c2
-rw-r--r--src/xlibi18n/utf8Wrap.c2
-rw-r--r--src/xlibi18n/wcWrap.c2
396 files changed, 658 insertions, 396 deletions
diff --git a/src/AllPlanes.c b/src/AllPlanes.c
index 4829babe..5f7e6bcc 100644
--- a/src/AllPlanes.c
+++ b/src/AllPlanes.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/AllPlanes.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/AllPlanes.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/AllowEv.c b/src/AllowEv.c
index 557c7e49..b87d3bec 100644
--- a/src/AllowEv.c
+++ b/src/AllowEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/AllowEv.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/AllowEv.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/AutoRep.c b/src/AutoRep.c
index bbc30e70..eb6a3073 100644
--- a/src/AutoRep.c
+++ b/src/AutoRep.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/AutoRep.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/AutoRep.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Backgnd.c b/src/Backgnd.c
index 748ccd27..76ebb13f 100644
--- a/src/Backgnd.c
+++ b/src/Backgnd.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Backgnd.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Backgnd.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/BdrWidth.c b/src/BdrWidth.c
index 0473339c..5178032f 100644
--- a/src/BdrWidth.c
+++ b/src/BdrWidth.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Bell.c b/src/Bell.c
index 8f048b80..53b77c81 100644
--- a/src/Bell.c
+++ b/src/Bell.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Bell.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Bell.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Border.c b/src/Border.c
index d692da2d..29f55555 100644
--- a/src/Border.c
+++ b/src/Border.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Border.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Border.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChAccCon.c b/src/ChAccCon.c
index 3e449aad..4d9281db 100644
--- a/src/ChAccCon.c
+++ b/src/ChAccCon.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChActPGb.c b/src/ChActPGb.c
index 1385679c..e1df3431 100644
--- a/src/ChActPGb.c
+++ b/src/ChActPGb.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChClMode.c b/src/ChClMode.c
index dabed0aa..4faa37f5 100644
--- a/src/ChClMode.c
+++ b/src/ChClMode.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChClMode.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChClMode.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChCmap.c b/src/ChCmap.c
index ffae9ef1..f3c02ded 100644
--- a/src/ChCmap.c
+++ b/src/ChCmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChCmap.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChCmap.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChGC.c b/src/ChGC.c
index eb2385af..9186dd05 100644
--- a/src/ChGC.c
+++ b/src/ChGC.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChGC.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChGC.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
#include "Xlibint.h"
#include "Cr.h"
diff --git a/src/ChKeyCon.c b/src/ChKeyCon.c
index c6e1f1ac..bc5419f4 100644
--- a/src/ChKeyCon.c
+++ b/src/ChKeyCon.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChPntCon.c b/src/ChPntCon.c
index 44aa8622..0a0fd6f0 100644
--- a/src/ChPntCon.c
+++ b/src/ChPntCon.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChProp.c b/src/ChProp.c
index 23bea2c8..606277d6 100644
--- a/src/ChProp.c
+++ b/src/ChProp.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChProp.c,v 1.5 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChProp.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChSaveSet.c b/src/ChSaveSet.c
index cf672813..a048b7bb 100644
--- a/src/ChSaveSet.c
+++ b/src/ChSaveSet.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChWAttrs.c b/src/ChWAttrs.c
index f2c498c5..215980b1 100644
--- a/src/ChWAttrs.c
+++ b/src/ChWAttrs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChWindow.c b/src/ChWindow.c
index dbabe40b..41af3bed 100644
--- a/src/ChWindow.c
+++ b/src/ChWindow.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChWindow.c,v 1.6 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChWindow.c,v 1.5 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c
index 48d098a8..7c56f52e 100644
--- a/src/ChkIfEv.c
+++ b/src/ChkIfEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChkIfEv.c,v 1.3 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c
index 315dfce2..961dce69 100644
--- a/src/ChkMaskEv.c
+++ b/src/ChkMaskEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.6 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.5 2001/10/28 03:32:29 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/ChkTypEv.c b/src/ChkTypEv.c
index 177737ae..c1c36d43 100644
--- a/src/ChkTypEv.c
+++ b/src/ChkTypEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChkTypEv.c,v 1.3 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChkTypEv.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/ChkTypWEv.c b/src/ChkTypWEv.c
index 7483bfa9..c15f2bcf 100644
--- a/src/ChkTypWEv.c
+++ b/src/ChkTypWEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChkTypWEv.c,v 1.3 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChkTypWEv.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/ChkWinEv.c b/src/ChkWinEv.c
index f7245544..2fd386d2 100644
--- a/src/ChkWinEv.c
+++ b/src/ChkWinEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.6 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/CirWin.c b/src/CirWin.c
index 3d7760f1..53c70440 100644
--- a/src/CirWin.c
+++ b/src/CirWin.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CirWin.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CirWin.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/CirWinDn.c b/src/CirWinDn.c
index 55711a3c..b790f2d7 100644
--- a/src/CirWinDn.c
+++ b/src/CirWinDn.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/CirWinUp.c b/src/CirWinUp.c
index b92486c7..12756cd3 100644
--- a/src/CirWinUp.c
+++ b/src/CirWinUp.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ClDisplay.c b/src/ClDisplay.c
index e2a379aa..25fac7b1 100644
--- a/src/ClDisplay.c
+++ b/src/ClDisplay.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
#include <X11/Xtrans.h>
#include "Xlib.h"
diff --git a/src/Clear.c b/src/Clear.c
index 125fba55..403943bc 100644
--- a/src/Clear.c
+++ b/src/Clear.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Clear.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Clear.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ClearArea.c b/src/ClearArea.c
index e42be06c..a85eb6ba 100644
--- a/src/ClearArea.c
+++ b/src/ClearArea.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ClearArea.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ClearArea.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Cmap.h b/src/Cmap.h
new file mode 100644
index 00000000..b4312be7
--- /dev/null
+++ b/src/Cmap.h
@@ -0,0 +1,11 @@
+/* $XFree86$ */
+
+#ifndef _CMAP_H_
+#define _CMAP_H_
+
+extern void
+_XcmsDeleteCmapRec(
+ Display *dpy,
+ Colormap cmap);
+
+#endif /* _CMAP_H_ */
diff --git a/src/ConfWind.c b/src/ConfWind.c
index a2f9b6dd..1c5813f5 100644
--- a/src/ConfWind.c
+++ b/src/ConfWind.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ConfWind.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ConfWind.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ConnDis.c b/src/ConnDis.c
index fbe821d0..3fbfcec4 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.4 2003-12-20 00:28:22 kaleb Exp $ */
+/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.4.4.1 2004-03-04 17:46:35 eich Exp $ */
/* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.29 2003/12/19 02:05:37 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ConnDis.c,v 3.28 2003/12/02 23:33:17 herrb Exp $ */
/*
* This file contains operating system dependencies.
diff --git a/src/Context.c b/src/Context.c
index 8526b7aa..fef578ff 100644
--- a/src/Context.c
+++ b/src/Context.c
@@ -50,7 +50,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Context.c,v 1.6 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Context.c,v 1.5 2001/12/14 19:53:58 dawes Exp $ */
/* This module implements a simple sparse array.
diff --git a/src/ConvSel.c b/src/ConvSel.c
index a0afd545..24d4f83b 100644
--- a/src/ConvSel.c
+++ b/src/ConvSel.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ConvSel.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ConvSel.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/CopyArea.c b/src/CopyArea.c
index 7f6a2682..a2a92a8d 100644
--- a/src/CopyArea.c
+++ b/src/CopyArea.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CopyArea.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CopyArea.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/CopyCmap.c b/src/CopyCmap.c
index 5287454b..9c7abcec 100644
--- a/src/CopyCmap.c
+++ b/src/CopyCmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/CopyGC.c b/src/CopyGC.c
index 592986fd..121bf5b8 100644
--- a/src/CopyGC.c
+++ b/src/CopyGC.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CopyGC.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CopyGC.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/CopyPlane.c b/src/CopyPlane.c
index f9c5728b..7adae39f 100644
--- a/src/CopyPlane.c
+++ b/src/CopyPlane.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Cr.h b/src/Cr.h
new file mode 100644
index 00000000..10181717
--- /dev/null
+++ b/src/Cr.h
@@ -0,0 +1,28 @@
+/* $XFree86$ */
+
+#ifndef _CR_H_
+#define _CR_H_
+
+extern int _XUpdateGCCache(
+ register GC gc,
+ register unsigned long mask,
+ register XGCValues *attr);
+extern void _XNoticeCreateBitmap(
+ Display *dpy,
+ Pixmap pid,
+ unsigned int width,
+ unsigned int height);
+extern void _XNoticePutBitmap(
+ Display *dpy,
+ Drawable draw,
+ XImage *image);
+extern Cursor _XTryShapeBitmapCursor(
+ Display *dpy,
+ Pixmap source,
+ Pixmap mask,
+ XColor *foreground,
+ XColor *background,
+ unsigned int x,
+ unsigned int y);
+
+#endif /* _CR_H_ */
diff --git a/src/CrBFData.c b/src/CrBFData.c
index 025f33e6..6e9aad1b 100644
--- a/src/CrBFData.c
+++ b/src/CrBFData.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrBFData.c,v 1.3 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86$ */
#include "Xlib.h"
diff --git a/src/CrCmap.c b/src/CrCmap.c
index e956aa4c..22a2cffe 100644
--- a/src/CrCmap.c
+++ b/src/CrCmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrCmap.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CrCmap.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/CrCursor.c b/src/CrCursor.c
index 16a1701a..c3ce84b3 100644
--- a/src/CrCursor.c
+++ b/src/CrCursor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrCursor.c,v 1.4 2002/11/23 19:27:48 tsi Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
diff --git a/src/CrGC.c b/src/CrGC.c
index 955f432a..b075d96b 100644
--- a/src/CrGC.c
+++ b/src/CrGC.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrGC.c,v 3.7 2003/04/13 19:22:15 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CrGC.c,v 3.6 2001/12/14 19:53:59 dawes Exp $ */
#include "Xlibint.h"
#include "Cr.h"
diff --git a/src/CrGlCur.c b/src/CrGlCur.c
index 62614609..4fc63112 100644
--- a/src/CrGlCur.c
+++ b/src/CrGlCur.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.8 2004/01/13 19:08:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.7 2003/04/13 19:22:15 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/CrPixmap.c b/src/CrPixmap.c
index d04168e0..6b4069c1 100644
--- a/src/CrPixmap.c
+++ b/src/CrPixmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/CrPixmap.c,v 1.4 2002/11/23 19:27:49 tsi Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
diff --git a/src/Cursor.c b/src/Cursor.c
index 68157ea1..82242eeb 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Cursor.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Cursor.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */
diff --git a/src/DefCursor.c b/src/DefCursor.c
index b4193bec..f8e479ad 100644
--- a/src/DefCursor.c
+++ b/src/DefCursor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DefCursor.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DefCursor.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DelProp.c b/src/DelProp.c
index 4933243e..4b2171aa 100644
--- a/src/DelProp.c
+++ b/src/DelProp.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DelProp.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DelProp.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DestSubs.c b/src/DestSubs.c
index d31feaac..465fc05d 100644
--- a/src/DestSubs.c
+++ b/src/DestSubs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DestSubs.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DestSubs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DestWind.c b/src/DestWind.c
index b05d7308..c218bc08 100644
--- a/src/DestWind.c
+++ b/src/DestWind.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DestWind.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DestWind.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DisName.c b/src/DisName.c
index 1456f656..efae8f31 100644
--- a/src/DisName.c
+++ b/src/DisName.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DisName.c,v 1.3 2003/04/13 19:22:15 dawes Exp $ */
+/* $XFree86$ */
/* XDisplayName.c */
/*
diff --git a/src/DrArc.c b/src/DrArc.c
index f1e099ab..8b416dd3 100644
--- a/src/DrArc.c
+++ b/src/DrArc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrArc.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrArc.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
/* Note to future maintainers: XDrawArc does NOT batch successive PolyArc
requests into a single request like XDrawLine, XDrawPoint, etc.
diff --git a/src/DrArcs.c b/src/DrArcs.c
index 8ba32a97..f798b748 100644
--- a/src/DrArcs.c
+++ b/src/DrArcs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrArcs.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrArcs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrLine.c b/src/DrLine.c
index aa54790e..8d9dca21 100644
--- a/src/DrLine.c
+++ b/src/DrLine.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrLine.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrLine.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrLines.c b/src/DrLines.c
index ace8062f..198aae5c 100644
--- a/src/DrLines.c
+++ b/src/DrLines.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrLines.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrLines.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrPoint.c b/src/DrPoint.c
index 8c858a22..c07942e3 100644
--- a/src/DrPoint.c
+++ b/src/DrPoint.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrPoint.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrPoint.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrPoints.c b/src/DrPoints.c
index 7d08f3eb..33d3b742 100644
--- a/src/DrPoints.c
+++ b/src/DrPoints.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrPoints.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrPoints.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrRect.c b/src/DrRect.c
index 9860035a..2fa0e466 100644
--- a/src/DrRect.c
+++ b/src/DrRect.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrRect.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrRect.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrRects.c b/src/DrRects.c
index c6a1e095..ff674e93 100644
--- a/src/DrRects.c
+++ b/src/DrRects.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrRects.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrRects.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/DrSegs.c b/src/DrSegs.c
index 1a7e6340..dde949da 100644
--- a/src/DrSegs.c
+++ b/src/DrSegs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/DrSegs.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/DrSegs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ErrDes.c b/src/ErrDes.c
index 911a31b1..cd1294a4 100644
--- a/src/ErrDes.c
+++ b/src/ErrDes.c
@@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/ErrDes.c,v 3.12 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ErrDes.c,v 3.11 2003/08/06 14:03:59 eich Exp $ */
#include "Xlibint.h"
#include <X11/Xos.h>
diff --git a/src/ErrHndlr.c b/src/ErrHndlr.c
index 9db99e8c..941d219c 100644
--- a/src/ErrHndlr.c
+++ b/src/ErrHndlr.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.6 2003/04/13 19:22:15 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/EvToWire.c b/src/EvToWire.c
index 7938a24e..2a84c322 100644
--- a/src/EvToWire.c
+++ b/src/EvToWire.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/EvToWire.c,v 1.5 2001/12/14 19:53:59 dawes Exp $ */
+/* $XFree86: xc/lib/X11/EvToWire.c,v 1.4 2001/08/18 02:41:28 dawes Exp $ */
/*
* XEvToWire.c - Internal support routines for the C subroutine
diff --git a/src/FSSaver.c b/src/FSSaver.c
index e0335481..0699257a 100644
--- a/src/FSSaver.c
+++ b/src/FSSaver.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FSSaver.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FSSaver.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FSWrap.c b/src/FSWrap.c
index d16068ec..2bdfa303 100644
--- a/src/FSWrap.c
+++ b/src/FSWrap.c
@@ -56,7 +56,7 @@ from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FSWrap.c,v 1.9 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FSWrap.c,v 1.8 2003/08/22 19:27:24 eich Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/FillArc.c b/src/FillArc.c
index c846431c..3866a891 100644
--- a/src/FillArc.c
+++ b/src/FillArc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FillArc.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FillArc.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FillArcs.c b/src/FillArcs.c
index ba975632..c644f306 100644
--- a/src/FillArcs.c
+++ b/src/FillArcs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FillArcs.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FillArcs.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FillPoly.c b/src/FillPoly.c
index d15246bf..a363247f 100644
--- a/src/FillPoly.c
+++ b/src/FillPoly.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FillPoly.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FillPoly.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FillRct.c b/src/FillRct.c
index cccb6aee..79da709f 100644
--- a/src/FillRct.c
+++ b/src/FillRct.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FillRct.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FillRct.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FillRcts.c b/src/FillRcts.c
index c581ab50..017cd0c3 100644
--- a/src/FillRcts.c
+++ b/src/FillRcts.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FillRcts.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FillRcts.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FilterEv.c b/src/FilterEv.c
index 94a1471e..afc7b444 100644
--- a/src/FilterEv.c
+++ b/src/FilterEv.c
@@ -53,7 +53,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FilterEv.c,v 3.5 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FilterEv.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/Flush.c b/src/Flush.c
index a0830b0e..58eb4e6d 100644
--- a/src/Flush.c
+++ b/src/Flush.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Flush.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Flush.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Font.c b/src/Font.c
index bba515bb..da1937a2 100644
--- a/src/Font.c
+++ b/src/Font.c
@@ -27,7 +27,7 @@ sale, use or other dealings in this Software without prior written
authorization from the X Consortium and the XFree86 Project.
*/
-/* $XFree86: xc/lib/X11/Font.c,v 1.18 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Font.c,v 1.17 2003/04/13 19:22:16 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/FontInfo.c b/src/FontInfo.c
index 8437d8cb..a98d0736 100644
--- a/src/FontInfo.c
+++ b/src/FontInfo.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FontInfo.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FontInfo.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/FontNames.c b/src/FontNames.c
index adfd91eb..f6e7036e 100644
--- a/src/FontNames.c
+++ b/src/FontNames.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FontNames.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FontNames.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/FreeCmap.c b/src/FreeCmap.c
index 493c0886..1195b3ad 100644
--- a/src/FreeCmap.c
+++ b/src/FreeCmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.5 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
#include "Xlib.h"
#include "Xlibint.h"
diff --git a/src/FreeCols.c b/src/FreeCols.c
index f0b57a94..d9516bad 100644
--- a/src/FreeCols.c
+++ b/src/FreeCols.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FreeCols.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FreeCols.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FreeCurs.c b/src/FreeCurs.c
index c4ad9514..8fff916a 100644
--- a/src/FreeCurs.c
+++ b/src/FreeCurs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FreeEData.c b/src/FreeEData.c
index 2fb083ab..d3555d54 100644
--- a/src/FreeEData.c
+++ b/src/FreeEData.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FreeEData.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FreeEData.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FreeGC.c b/src/FreeGC.c
index ab5b1ac9..96e61de3 100644
--- a/src/FreeGC.c
+++ b/src/FreeGC.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FreeGC.c,v 1.5 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FreeGC.c,v 1.4 2001/08/18 02:41:28 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/FreePix.c b/src/FreePix.c
index b517645e..40ad42f3 100644
--- a/src/FreePix.c
+++ b/src/FreePix.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FreePix.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/FreePix.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/GCMisc.c b/src/GCMisc.c
index 54d37d99..62f4af00 100644
--- a/src/GCMisc.c
+++ b/src/GCMisc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GCMisc.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GCMisc.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Geom.c b/src/Geom.c
index 1c456736..0980094c 100644
--- a/src/Geom.c
+++ b/src/Geom.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Geom.c,v 1.3 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xutil.h"
diff --git a/src/GetAtomNm.c b/src/GetAtomNm.c
index 418dc6e4..495fb426 100644
--- a/src/GetAtomNm.c
+++ b/src/GetAtomNm.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.5 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.4 2001/08/18 02:41:28 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetColor.c b/src/GetColor.c
index f374995e..2ccaf92f 100644
--- a/src/GetColor.c
+++ b/src/GetColor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetColor.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetColor.c,v 1.6 2003/04/13 19:22:16 dawes Exp $ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/src/GetDflt.c b/src/GetDflt.c
index 22ea3cc7..6146ca49 100644
--- a/src/GetDflt.c
+++ b/src/GetDflt.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/GetDflt.c,v 3.23 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetDflt.c,v 3.22 2003/04/13 19:22:16 dawes Exp $ */
#include "Xlibint.h"
#include <X11/Xos.h>
diff --git a/src/GetFPath.c b/src/GetFPath.c
index 03d4aaad..6db1602e 100644
--- a/src/GetFPath.c
+++ b/src/GetFPath.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetFPath.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetFPath.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetHints.c b/src/GetHints.c
index 6f835e92..d2452700 100644
--- a/src/GetHints.c
+++ b/src/GetHints.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/GetHints.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetHints.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xos.h>
diff --git a/src/GetIFocus.c b/src/GetIFocus.c
index 9e17b853..fe1e80f8 100644
--- a/src/GetIFocus.c
+++ b/src/GetIFocus.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetImage.c b/src/GetImage.c
index 8b1224a3..3a2939cf 100644
--- a/src/GetImage.c
+++ b/src/GetImage.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetImage.c,v 1.5 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetImage.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetKCnt.c b/src/GetKCnt.c
index 8d109aec..525ea1b9 100644
--- a/src/GetKCnt.c
+++ b/src/GetKCnt.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.5 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetPCnt.c b/src/GetPCnt.c
index 19d6b76d..457dc9bc 100644
--- a/src/GetPCnt.c
+++ b/src/GetPCnt.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetPntMap.c b/src/GetPntMap.c
index 28e5f4dd..65a5215f 100644
--- a/src/GetPntMap.c
+++ b/src/GetPntMap.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.7 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.6 2001/12/14 19:54:01 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetProp.c b/src/GetProp.c
index 23214f9c..3323c778 100644
--- a/src/GetProp.c
+++ b/src/GetProp.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetProp.c,v 1.6 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetProp.c,v 1.5 2001/10/28 03:32:30 tsi Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetSSaver.c b/src/GetSSaver.c
index d7f05ccf..1dc004d9 100644
--- a/src/GetSSaver.c
+++ b/src/GetSSaver.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GetWAttrs.c b/src/GetWAttrs.c
index e518925f..c5e9d438 100644
--- a/src/GetWAttrs.c
+++ b/src/GetWAttrs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetWAttrs.c,v 1.3 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/GrButton.c b/src/GrButton.c
index 87e6a2e8..af642e9a 100644
--- a/src/GrButton.c
+++ b/src/GrButton.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GrButton.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GrButton.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/GrKey.c b/src/GrKey.c
index 53e1a962..a1d5973f 100644
--- a/src/GrKey.c
+++ b/src/GrKey.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GrKey.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GrKey.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/GrServer.c b/src/GrServer.c
index c1e2f2d9..df8cf3f2 100644
--- a/src/GrServer.c
+++ b/src/GrServer.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GrServer.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/GrServer.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Host.c b/src/Host.c
index 7d0c3a7c..b82878ef 100644
--- a/src/Host.c
+++ b/src/Host.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Host.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Host.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
/* this might be rightly reguarded an os dependent file */
diff --git a/src/IfEvent.c b/src/IfEvent.c
index 45d04ac9..57b792d8 100644
--- a/src/IfEvent.c
+++ b/src/IfEvent.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/IfEvent.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/IfEvent.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/ImText.c b/src/ImText.c
index 32ec8c86..c6cd2c04 100644
--- a/src/ImText.c
+++ b/src/ImText.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ImText.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ImText.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/ImText16.c b/src/ImText16.c
index f3fbdbeb..cabcf279 100644
--- a/src/ImText16.c
+++ b/src/ImText16.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ImText16.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ImText16.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/ImUtil.c b/src/ImUtil.c
index 92e031db..446bef23 100644
--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ImUtil.c,v 3.13 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ImUtil.c,v 3.12 2003/04/15 22:10:06 herrb Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
diff --git a/src/InitExt.c b/src/InitExt.c
index 8031d21e..215ed7b3 100644
--- a/src/InitExt.c
+++ b/src/InitExt.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/InitExt.c,v 1.8 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/InitExt.c,v 1.7 2001/12/14 19:54:02 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xos.h>
diff --git a/src/InsCmap.c b/src/InsCmap.c
index 2e3ee55f..df0dc9f7 100644
--- a/src/InsCmap.c
+++ b/src/InsCmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/InsCmap.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/InsCmap.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/IntAtom.c b/src/IntAtom.c
index 106ce69f..00240fd9 100644
--- a/src/IntAtom.c
+++ b/src/IntAtom.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/IntAtom.c,v 1.7 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/IntAtom.c,v 1.6 2001/12/14 19:54:02 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/Key.h b/src/Key.h
new file mode 100644
index 00000000..a0ca795d
--- /dev/null
+++ b/src/Key.h
@@ -0,0 +1,18 @@
+/* $XFree86$ */
+
+#ifndef _KEY_H_
+#define _KEY_H_
+
+#ifndef NEEDKTABLE
+extern const unsigned char _XkeyTable[];
+#endif
+
+extern int
+_XKeyInitialize(
+ Display *dpy);
+
+extern XrmDatabase
+_XInitKeysymDB(
+ void);
+
+#endif /* _KEY_H_ */
diff --git a/src/KeyBind.c b/src/KeyBind.c
index 98f46e5a..36108245 100644
--- a/src/KeyBind.c
+++ b/src/KeyBind.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/KeyBind.c,v 1.9 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/KeyBind.c,v 1.8 2003/05/27 22:26:25 tsi Exp $ */
/* Beware, here be monsters (still under construction... - JG */
diff --git a/src/KeysymStr.c b/src/KeysymStr.c
index 0a6a3f23..5a21f05f 100644
--- a/src/KeysymStr.c
+++ b/src/KeysymStr.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.10 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.9 2003/04/13 19:22:16 dawes Exp $ */
#include "Xlibint.h"
#include <X11/Xresource.h>
diff --git a/src/KillCl.c b/src/KillCl.c
index 1e73559e..6f05057c 100644
--- a/src/KillCl.c
+++ b/src/KillCl.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/KillCl.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/KillCl.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/LiICmaps.c b/src/LiICmaps.c
index a1c6491b..93a45025 100644
--- a/src/LiICmaps.c
+++ b/src/LiICmaps.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/LiICmaps.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LiICmaps.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/LiProps.c b/src/LiProps.c
index 98a54b3b..346b8cac 100644
--- a/src/LiProps.c
+++ b/src/LiProps.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/LiProps.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LiProps.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/ListExt.c b/src/ListExt.c
index 063e2439..e0a35c20 100644
--- a/src/ListExt.c
+++ b/src/ListExt.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ListExt.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ListExt.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/LoadFont.c b/src/LoadFont.c
index 0e6dba22..bffdafe8 100644
--- a/src/LoadFont.c
+++ b/src/LoadFont.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/LoadFont.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LoadFont.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/LockDis.c b/src/LockDis.c
index 7912a949..96aabe45 100644
--- a/src/LockDis.c
+++ b/src/LockDis.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/LockDis.c,v 1.3 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86$ */
/*
* Author: Stephen Gildea, MIT X Consortium
diff --git a/src/LookupCol.c b/src/LookupCol.c
index 14ad14da..e68625e8 100644
--- a/src/LookupCol.c
+++ b/src/LookupCol.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/LookupCol.c,v 1.7 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LookupCol.c,v 1.6 2003/04/13 19:22:16 dawes Exp $ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/src/LowerWin.c b/src/LowerWin.c
index 15021fcd..1a639deb 100644
--- a/src/LowerWin.c
+++ b/src/LowerWin.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/LowerWin.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LowerWin.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Macros.c b/src/Macros.c
index 03509636..cc7c6172 100644
--- a/src/Macros.c
+++ b/src/Macros.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Macros.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Macros.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
#include "Xlibint.h"
#define XUTIL_DEFINE_FUNCTIONS
diff --git a/src/MapRaised.c b/src/MapRaised.c
index de411fb7..fc98179d 100644
--- a/src/MapRaised.c
+++ b/src/MapRaised.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/MapRaised.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/MapRaised.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/MapSubs.c b/src/MapSubs.c
index d0a6af20..8c07b7d5 100644
--- a/src/MapSubs.c
+++ b/src/MapSubs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/MapSubs.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/MapSubs.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/MapWindow.c b/src/MapWindow.c
index eb3c1389..5258fd91 100644
--- a/src/MapWindow.c
+++ b/src/MapWindow.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/MapWindow.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */
+/* $XFree86: xc/lib/X11/MapWindow.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/MaskEvent.c b/src/MaskEvent.c
index be352d35..94db3ae2 100644
--- a/src/MaskEvent.c
+++ b/src/MaskEvent.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.6 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/Misc.c b/src/Misc.c
index d234c648..bd017bad 100644
--- a/src/Misc.c
+++ b/src/Misc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Misc.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Misc.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ModMap.c b/src/ModMap.c
index 49e599d7..8740bd82 100644
--- a/src/ModMap.c
+++ b/src/ModMap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ModMap.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ModMap.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/MoveWin.c b/src/MoveWin.c
index 96ed8e2f..c693065b 100644
--- a/src/MoveWin.c
+++ b/src/MoveWin.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/MoveWin.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/MoveWin.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/NextEvent.c b/src/NextEvent.c
index 14492678..82805b57 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/NextEvent.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/NextEvent.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/OCWrap.c b/src/OCWrap.c
index eb496814..bd74f1e1 100644
--- a/src/OCWrap.c
+++ b/src/OCWrap.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/OCWrap.c,v 1.4 2001/07/25 15:04:44 dawes Exp $ */
+/* $XFree86: xc/lib/X11/OCWrap.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/OMWrap.c b/src/OMWrap.c
index dcb09b95..988b63a5 100644
--- a/src/OMWrap.c
+++ b/src/OMWrap.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/OMWrap.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/OMWrap.c,v 1.4 2001/07/25 15:04:44 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/OpenDis.c b/src/OpenDis.c
index dc98f230..b5e2b49a 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/OpenDis.c,v 3.17 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/OpenDis.c,v 3.16 2003/07/04 16:24:23 eich Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/ParseCmd.c b/src/ParseCmd.c
index 121b8d04..7fd54246 100644
--- a/src/ParseCmd.c
+++ b/src/ParseCmd.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.5 2001/12/14 19:54:03 dawes Exp $ */
/* XrmParseCommand()
diff --git a/src/ParseCol.c b/src/ParseCol.c
index af699ec5..018f79e1 100644
--- a/src/ParseCol.c
+++ b/src/ParseCol.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ParseCol.c,v 1.7 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ParseCol.c,v 1.6 2003/04/13 19:22:17 dawes Exp $ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/src/ParseGeom.c b/src/ParseGeom.c
index a08a15d7..c00dc21a 100644
--- a/src/ParseGeom.c
+++ b/src/ParseGeom.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ParseGeom.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ParseGeom.c,v 1.3 2001/12/14 19:54:03 dawes Exp $ */
#include "Xlibint.h"
#include "Xutil.h"
diff --git a/src/PeekEvent.c b/src/PeekEvent.c
index a98eb8f4..4e2a61df 100644
--- a/src/PeekEvent.c
+++ b/src/PeekEvent.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c
index 48a1f896..313c6981 100644
--- a/src/PeekIfEv.c
+++ b/src/PeekIfEv.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/PmapBgnd.c b/src/PmapBgnd.c
index ac0c573d..18931949 100644
--- a/src/PmapBgnd.c
+++ b/src/PmapBgnd.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/PmapBord.c b/src/PmapBord.c
index ed3e90a6..cd5fc6c9 100644
--- a/src/PmapBord.c
+++ b/src/PmapBord.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PmapBord.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PmapBord.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/PolyReg.c b/src/PolyReg.c
index 3e196cc7..66c50c4b 100644
--- a/src/PolyReg.c
+++ b/src/PolyReg.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
************************************************************************/
-/* $XFree86: xc/lib/X11/PolyReg.c,v 1.7 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PolyReg.c,v 1.6 2001/12/14 19:54:03 dawes Exp $ */
#define LARGE_COORDINATE 1000000
#define SMALL_COORDINATE -LARGE_COORDINATE
diff --git a/src/PolyTxt.c b/src/PolyTxt.c
index f7a28c38..bd885266 100644
--- a/src/PolyTxt.c
+++ b/src/PolyTxt.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.6 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */
#include "Xlibint.h"
diff --git a/src/PolyTxt16.c b/src/PolyTxt16.c
index 3bc7ac6e..c7dce509 100644
--- a/src/PolyTxt16.c
+++ b/src/PolyTxt16.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.5 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.4 2001/10/28 03:32:31 tsi Exp $ */
#include "Xlibint.h"
diff --git a/src/PropAlloc.c b/src/PropAlloc.c
index 0df32a76..96c92bbf 100644
--- a/src/PropAlloc.c
+++ b/src/PropAlloc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */
#include "Xlibint.h"
#include "Xutil.h"
diff --git a/src/PutBEvent.c b/src/PutBEvent.c
index 7e003ebc..2260359f 100644
--- a/src/PutBEvent.c
+++ b/src/PutBEvent.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */
/* XPutBackEvent puts an event back at the head of the queue. */
#define NEED_EVENTS
diff --git a/src/PutImage.c b/src/PutImage.c
index 660501fa..415255a2 100644
--- a/src/PutImage.c
+++ b/src/PutImage.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/PutImage.c,v 3.12 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/PutImage.c,v 3.11 2002/12/09 04:10:56 tsi Exp $ */
#include "Xlibint.h"
#include "Xutil.h"
diff --git a/src/QuColor.c b/src/QuColor.c
index 27e6ff85..d7da47e8 100644
--- a/src/QuColor.c
+++ b/src/QuColor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuColor.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuColor.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/QuColors.c b/src/QuColors.c
index f6f7c0a0..1603a56f 100644
--- a/src/QuColors.c
+++ b/src/QuColors.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuColors.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuColors.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/QuExt.c b/src/QuExt.c
index dd700537..686334e0 100644
--- a/src/QuExt.c
+++ b/src/QuExt.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuExt.c,v 1.3 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/QuKeybd.c b/src/QuKeybd.c
index c6872118..4a7b8fba 100644
--- a/src/QuKeybd.c
+++ b/src/QuKeybd.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/QuTextE16.c b/src/QuTextE16.c
index 8f2f82b1..58003f49 100644
--- a/src/QuTextE16.c
+++ b/src/QuTextE16.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/QuTextExt.c b/src/QuTextExt.c
index ef757a46..3ab18138 100644
--- a/src/QuTextExt.c
+++ b/src/QuTextExt.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/QuTree.c b/src/QuTree.c
index 2b28b504..bb7307a1 100644
--- a/src/QuTree.c
+++ b/src/QuTree.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/QuTree.c,v 1.6 2001/12/14 19:54:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuTree.c,v 1.5 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#include "Xlibint.h"
diff --git a/src/Quarks.c b/src/Quarks.c
index 56005ce0..70f6f492 100644
--- a/src/Quarks.c
+++ b/src/Quarks.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Quarks.c,v 1.7 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Quarks.c,v 1.6 2003/04/13 19:22:17 dawes Exp $ */
#include "Xlibint.h"
#include <X11/Xresource.h>
diff --git a/src/RaiseWin.c b/src/RaiseWin.c
index bc95a382..a11aed8b 100644
--- a/src/RaiseWin.c
+++ b/src/RaiseWin.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/RdBitF.c b/src/RdBitF.c
index 085f0e2d..b2826966 100644
--- a/src/RdBitF.c
+++ b/src/RdBitF.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RdBitF.c,v 3.7 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RdBitF.c,v 3.6 2003/04/13 19:22:17 dawes Exp $ */
/*
* Code to read bitmaps from disk files. Interprets
diff --git a/src/RecolorC.c b/src/RecolorC.c
index 23fdc6ea..3066d1ad 100644
--- a/src/RecolorC.c
+++ b/src/RecolorC.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RecolorC.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RecolorC.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/ReconfWin.c b/src/ReconfWin.c
index 93ae47de..ef536ff3 100644
--- a/src/ReconfWin.c
+++ b/src/ReconfWin.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Region.c b/src/Region.c
index af1f0f22..79fb8e8b 100644
--- a/src/Region.c
+++ b/src/Region.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
************************************************************************/
-/* $XFree86: xc/lib/X11/Region.c,v 1.10 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Region.c,v 1.9 2002/06/04 22:19:57 dawes Exp $ */
/*
* The functions in this file implement the Region abstraction, similar to one
* used in the X11 sample server. A Region is simply an area, as the name
diff --git a/src/RegstFlt.c b/src/RegstFlt.c
index 1f973121..e3702bae 100644
--- a/src/RegstFlt.c
+++ b/src/RegstFlt.c
@@ -52,7 +52,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/RepWindow.c b/src/RepWindow.c
index 897c5288..2193220d 100644
--- a/src/RepWindow.c
+++ b/src/RepWindow.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RepWindow.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RepWindow.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/RestackWs.c b/src/RestackWs.c
index 283fd0b6..8060f17a 100644
--- a/src/RestackWs.c
+++ b/src/RestackWs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RestackWs.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RestackWs.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/RotProp.c b/src/RotProp.c
index d3220ae3..4020606f 100644
--- a/src/RotProp.c
+++ b/src/RotProp.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RotProp.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
+/* $XFree86: xc/lib/X11/RotProp.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SelInput.c b/src/SelInput.c
index 493d3801..5a8870e4 100644
--- a/src/SelInput.c
+++ b/src/SelInput.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SelInput.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SelInput.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SendEvent.c b/src/SendEvent.c
index 6d30763e..6d7d6229 100644
--- a/src/SendEvent.c
+++ b/src/SendEvent.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SendEvent.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SendEvent.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/SetBack.c b/src/SetBack.c
index 80851b32..6c207f7d 100644
--- a/src/SetBack.c
+++ b/src/SetBack.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetBack.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetBack.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetCRects.c b/src/SetCRects.c
index e9a63237..194998c3 100644
--- a/src/SetCRects.c
+++ b/src/SetCRects.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetCRects.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetCRects.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetClMask.c b/src/SetClMask.c
index 338eb529..2503aef5 100644
--- a/src/SetClMask.c
+++ b/src/SetClMask.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetClMask.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetClMask.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetClOrig.c b/src/SetClOrig.c
index 921d18b6..659c9a8a 100644
--- a/src/SetClOrig.c
+++ b/src/SetClOrig.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetDashes.c b/src/SetDashes.c
index 63e9b80e..9fd0472f 100644
--- a/src/SetDashes.c
+++ b/src/SetDashes.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetDashes.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetDashes.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetFPath.c b/src/SetFPath.c
index f223648e..09441df0 100644
--- a/src/SetFPath.c
+++ b/src/SetFPath.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetFPath.c,v 1.6 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetFPath.c,v 1.5 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetFont.c b/src/SetFont.c
index 72a3ba7e..9a8e67db 100644
--- a/src/SetFont.c
+++ b/src/SetFont.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetFont.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetFont.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetFore.c b/src/SetFore.c
index d2528c76..e938d8fa 100644
--- a/src/SetFore.c
+++ b/src/SetFore.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetFore.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetFore.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetFunc.c b/src/SetFunc.c
index 3ec758ec..c0041317 100644
--- a/src/SetFunc.c
+++ b/src/SetFunc.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetFunc.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetFunc.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetHints.c b/src/SetHints.c
index f6f25a7e..ffa5ebe9 100644
--- a/src/SetHints.c
+++ b/src/SetHints.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/SetHints.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetHints.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
diff --git a/src/SetIFocus.c b/src/SetIFocus.c
index 084b77a1..2e0eb1d9 100644
--- a/src/SetIFocus.c
+++ b/src/SetIFocus.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetLStyle.c b/src/SetLStyle.c
index da51591b..9f0c8c5e 100644
--- a/src/SetLStyle.c
+++ b/src/SetLStyle.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetLocale.c b/src/SetLocale.c
index b54fc918..da5f645b 100644
--- a/src/SetLocale.c
+++ b/src/SetLocale.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.4 2004-02-23 21:34:20 kaleb Exp $ */
+/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.4.2.1 2004-03-04 17:46:36 eich Exp $ */
/* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
@@ -56,7 +56,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetLocale.c,v 3.21 2004/02/11 00:30:44 torrey Exp $ */
+/* $XFree86: xc/lib/X11/SetLocale.c,v 3.20 2003/11/17 22:20:08 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/SetPMask.c b/src/SetPMask.c
index fbb94ef3..6c4b826c 100644
--- a/src/SetPMask.c
+++ b/src/SetPMask.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetPMask.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetPMask.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetPntMap.c b/src/SetPntMap.c
index b4ea39fa..7942537b 100644
--- a/src/SetPntMap.c
+++ b/src/SetPntMap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
#define NEED_REPLIES
diff --git a/src/SetSOwner.c b/src/SetSOwner.c
index 1426ee25..40481ded 100644
--- a/src/SetSOwner.c
+++ b/src/SetSOwner.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetSSaver.c b/src/SetSSaver.c
index 227a9250..cea64f25 100644
--- a/src/SetSSaver.c
+++ b/src/SetSSaver.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetState.c b/src/SetState.c
index 79658104..ecd51901 100644
--- a/src/SetState.c
+++ b/src/SetState.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetState.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetState.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetStip.c b/src/SetStip.c
index 84d90012..cb2ed999 100644
--- a/src/SetStip.c
+++ b/src/SetStip.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetStip.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetStip.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetTSOrig.c b/src/SetTSOrig.c
index ef449ca0..d72e5cae 100644
--- a/src/SetTSOrig.c
+++ b/src/SetTSOrig.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/SetTile.c b/src/SetTile.c
index 0199ae7c..58ba8d90 100644
--- a/src/SetTile.c
+++ b/src/SetTile.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetTile.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetTile.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/StBytes.c b/src/StBytes.c
index ec4c567f..5daa3536 100644
--- a/src/StBytes.c
+++ b/src/StBytes.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/StBytes.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StBytes.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xatom.h>
diff --git a/src/StColor.c b/src/StColor.c
index 0f90cfd7..10387873 100644
--- a/src/StColor.c
+++ b/src/StColor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/StColor.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StColor.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/StColors.c b/src/StColors.c
index 04073979..3ad030fa 100644
--- a/src/StColors.c
+++ b/src/StColors.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/StColors.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StColors.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/StNColor.c b/src/StNColor.c
index 83852874..0ffbdc12 100644
--- a/src/StNColor.c
+++ b/src/StNColor.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/StNColor.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StNColor.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */
#include <stdio.h>
#include "Xlibint.h"
diff --git a/src/StName.c b/src/StName.c
index 7d1963bf..051bdda4 100644
--- a/src/StName.c
+++ b/src/StName.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/StName.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StName.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xatom.h>
diff --git a/src/StrKeysym.c b/src/StrKeysym.c
index e13ee78a..e2818716 100644
--- a/src/StrKeysym.c
+++ b/src/StrKeysym.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.8 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.7 2003/04/13 19:22:18 dawes Exp $ */
#include "Xlibint.h"
#include <X11/Xresource.h>
diff --git a/src/Sync.c b/src/Sync.c
index 50527a99..ae423d09 100644
--- a/src/Sync.c
+++ b/src/Sync.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Sync.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Sync.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/Synchro.c b/src/Synchro.c
index 713bc231..8c84f504 100644
--- a/src/Synchro.c
+++ b/src/Synchro.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Synchro.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Synchro.c,v 1.3 2003/04/13 19:22:18 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Text.c b/src/Text.c
index 7dddfa9b..23a57534 100644
--- a/src/Text.c
+++ b/src/Text.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Text.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Text.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/Text16.c b/src/Text16.c
index 89d05ab9..2eee708b 100644
--- a/src/Text16.c
+++ b/src/Text16.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Text16.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Text16.c,v 1.5 2001/12/14 19:54:07 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/TextExt.c b/src/TextExt.c
index 6b390919..1e6b1dce 100644
--- a/src/TextExt.c
+++ b/src/TextExt.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/TextExt.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/TextExt.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
/*
* Copyright 1995 by FUJITSU LIMITED
* This is source code modified by FUJITSU LIMITED under the Joint
diff --git a/src/TextExt16.c b/src/TextExt16.c
index 5707faa7..9b4899cb 100644
--- a/src/TextExt16.c
+++ b/src/TextExt16.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/TextExt16.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/TextExt16.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
/*
* Copyright 1995 by FUJITSU LIMITED
* This is source code modified by FUJITSU LIMITED under the Joint
diff --git a/src/TextToStr.c b/src/TextToStr.c
index 2c0b1f6d..c775fa6e 100644
--- a/src/TextToStr.c
+++ b/src/TextToStr.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/TextToStr.c,v 1.5 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/TextToStr.c,v 1.4 2001/01/17 19:41:45 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xatom.h>
diff --git a/src/UIThrStubs.c b/src/UIThrStubs.c
index 64be42a8..3da0549e 100644
--- a/src/UIThrStubs.c
+++ b/src/UIThrStubs.c
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.4 2003/01/15 02:55:16 dawes Exp $
+ * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.3 2001/11/18 21:13:26 herrb Exp $
*
* Copyright (c) 1995 David E. Wexelblat. All rights reserved
*
diff --git a/src/UndefCurs.c b/src/UndefCurs.c
index 8db1db74..ced35187 100644
--- a/src/UndefCurs.c
+++ b/src/UndefCurs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UngrabBut.c b/src/UngrabBut.c
index 8ad44edb..4f1e12d0 100644
--- a/src/UngrabBut.c
+++ b/src/UngrabBut.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UngrabKbd.c b/src/UngrabKbd.c
index 1a298f50..b4720a49 100644
--- a/src/UngrabKbd.c
+++ b/src/UngrabKbd.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UngrabKey.c b/src/UngrabKey.c
index 3489c754..4f001d2e 100644
--- a/src/UngrabKey.c
+++ b/src/UngrabKey.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UngrabPtr.c b/src/UngrabPtr.c
index 11da4e3c..1d6a02ea 100644
--- a/src/UngrabPtr.c
+++ b/src/UngrabPtr.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UngrabSvr.c b/src/UngrabSvr.c
index f084fcd6..6ec8ccef 100644
--- a/src/UngrabSvr.c
+++ b/src/UngrabSvr.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UninsCmap.c b/src/UninsCmap.c
index c3ed9a49..cd9af166 100644
--- a/src/UninsCmap.c
+++ b/src/UninsCmap.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UnldFont.c b/src/UnldFont.c
index e465ca77..aafd9041 100644
--- a/src/UnldFont.c
+++ b/src/UnldFont.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UnldFont.c,v 1.6 2001/12/19 15:37:57 tsi Exp $ */
+/* $XFree86: xc/lib/X11/UnldFont.c,v 1.5 2001/12/14 19:54:07 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UnmapSubs.c b/src/UnmapSubs.c
index 785a8833..56e30b7e 100644
--- a/src/UnmapSubs.c
+++ b/src/UnmapSubs.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/UnmapWin.c b/src/UnmapWin.c
index e10462e1..da0e895c 100644
--- a/src/UnmapWin.c
+++ b/src/UnmapWin.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/WMGeom.c b/src/WMGeom.c
index 05ce8e46..7eb945f7 100644
--- a/src/WMGeom.c
+++ b/src/WMGeom.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/WMGeom.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/WMGeom.c,v 1.3 2003/04/13 19:22:18 dawes Exp $ */
#include "Xlibint.h"
#include "Xutil.h"
diff --git a/src/WMProps.c b/src/WMProps.c
index ddd4d6f5..6e4e474c 100644
--- a/src/WMProps.c
+++ b/src/WMProps.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/WMProps.c,v 3.7 2002/05/31 18:45:41 dawes Exp $ */
+/* $XFree86: xc/lib/X11/WMProps.c,v 3.6 2001/12/14 19:54:07 dawes Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
diff --git a/src/WarpPtr.c b/src/WarpPtr.c
index f14935b7..e83a7e2a 100644
--- a/src/WarpPtr.c
+++ b/src/WarpPtr.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.4 2001/12/14 19:54:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.3 2001/01/17 19:41:47 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/WinEvent.c b/src/WinEvent.c
index 491e0553..d69a6671 100644
--- a/src/WinEvent.c
+++ b/src/WinEvent.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/WinEvent.c,v 3.6 2001/12/14 19:54:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/WinEvent.c,v 3.5 2001/10/28 03:32:32 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/Window.c b/src/Window.c
index 470c1c2c..05628369 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Window.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Window.c,v 1.4 2001/12/14 19:54:08 dawes Exp $ */
#include "Xlibint.h"
diff --git a/src/WrBitF.c b/src/WrBitF.c
index e45e2949..f57bd930 100644
--- a/src/WrBitF.c
+++ b/src/WrBitF.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/WrBitF.c,v 3.7 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/WrBitF.c,v 3.6 2003/04/13 19:22:18 dawes Exp $ */
#include "Xlibint.h"
#include <X11/Xos.h>
diff --git a/src/XErrorDB b/src/XErrorDB
index 246ae15c..c1d6bf3d 100644
--- a/src/XErrorDB
+++ b/src/XErrorDB
@@ -23,7 +23,7 @@
! other dealings in this Software without prior written authorization
! from The Open Group.
!
-! $XFree86: xc/lib/X11/XErrorDB,v 3.41 2002/12/22 00:46:50 dawes Exp $
+! $XFree86: xc/lib/X11/XErrorDB,v 3.40 2002/12/21 17:51:42 dawes Exp $
!
! these are used in XGetErrorMessage.
XlibMessage.XError: X Error of failed request
diff --git a/src/XKeysymDB b/src/XKeysymDB
index 0a259851..f1469505 100644
--- a/src/XKeysymDB
+++ b/src/XKeysymDB
@@ -11,7 +11,7 @@
! suitability of this software for any purpose. It is provided "as is"
! without express or implied warranty.
!
-! $XFree86: xc/lib/X11/XKeysymDB,v 3.17 2003/02/14 22:02:26 dawes Exp $
+! $XFree86: xc/lib/X11/XKeysymDB,v 3.16 2003/02/11 02:51:10 dawes Exp $
hpmute_acute :100000A8
hpmute_grave :100000A9
diff --git a/src/Xintatom.h b/src/Xintatom.h
index 910c0fa2..f1e13568 100644
--- a/src/Xintatom.h
+++ b/src/Xintatom.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/Xintatom.h,v 1.1 2001/08/18 02:41:28 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XINTATOM_H_
#define _XINTATOM_H_ 1
diff --git a/src/Xintconn.h b/src/Xintconn.h
index f210d4e3..edea9830 100644
--- a/src/Xintconn.h
+++ b/src/Xintconn.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/Xintconn.h,v 1.2 2003/04/13 19:22:19 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Xintconn.h,v 1.1 2001/08/18 02:41:28 dawes Exp $ */
#ifndef _XINTCONN_H_
#define _XINTCONN_H_ 1
diff --git a/src/XlibInt.c b/src/XlibInt.c
index 6bb2d181..cc73b7df 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/XlibInt.c,v 3.39 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XlibInt.c,v 3.38 2003/10/30 21:55:05 alanh Exp $ */
/*
* XlibInt.c - Internal support routines for the C subroutine
diff --git a/src/XomGeneric.h b/src/XomGeneric.h
index 9b547495..ce61eca3 100644
--- a/src/XomGeneric.h
+++ b/src/XomGeneric.h
@@ -31,7 +31,7 @@
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/XomGeneric.h,v 1.6 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XomGeneric.h,v 1.5 2003/04/13 19:22:19 dawes Exp $ */
#ifndef _XOMGENERIC_H_
#define _XOMGENERIC_H_
diff --git a/src/Xresinternal.h b/src/Xresinternal.h
new file mode 100644
index 00000000..fc752855
--- /dev/null
+++ b/src/Xresinternal.h
@@ -0,0 +1,15 @@
+/* $XFree86$ */
+
+#ifndef _XRESINTERNAL_H_
+#define _XRESINTERNAL_H_
+
+/* type defines */
+typedef unsigned long Signature;
+
+/* prototypes */
+extern XrmQuark _XrmInternalStringToQuark(
+ register _Xconst char *name, register int len, register Signature sig,
+ Bool permstring);
+
+#endif /* _XRESOURCEINTERNAL_H_ */
+/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/src/Xrm.c b/src/Xrm.c
index 47c50fe1..76d4fb94 100644
--- a/src/Xrm.c
+++ b/src/Xrm.c
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Xrm.c,v 3.23 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Xrm.c,v 3.22 2003/07/16 01:38:26 dawes Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/src/evtomask.c b/src/evtomask.c
index 0646a880..1ce018cd 100644
--- a/src/evtomask.c
+++ b/src/evtomask.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/evtomask.c,v 3.5 2001/12/14 19:54:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/evtomask.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */
#include <X11/X.h>
diff --git a/src/globals.c b/src/globals.c
index 266349ab..0fa860dc 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/globals.c,v 3.5 2001/12/14 19:54:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/globals.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */
/*
*
diff --git a/src/imConv.c b/src/imConv.c
index b77eaae7..e0015716 100644
--- a/src/imConv.c
+++ b/src/imConv.c
@@ -33,7 +33,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
/* 2000 Modifier: Ivan Pascal The XFree86 Project.
*/
-/* $XFree86: xc/lib/X11/imConv.c,v 1.33 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/imConv.c,v 1.32 2003/04/13 19:22:20 dawes Exp $ */
#define NEED_EVENTS
#include <stdio.h>
diff --git a/src/locking.c b/src/locking.c
index c13cdc1b..3508dea8 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/locking.c,v 1.6 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/locking.c,v 1.5 2003/04/13 19:22:22 dawes Exp $ */
/*
* Author: Stephen Gildea, MIT X Consortium
diff --git a/src/locking.h b/src/locking.h
index 7139d5af..96c99b97 100644
--- a/src/locking.h
+++ b/src/locking.h
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/locking.h,v 1.5 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/locking.h,v 1.4 2001/12/14 19:54:10 dawes Exp $ */
/*
* Author: Stephen Gildea, MIT X Consortium
diff --git a/src/os2Stubs.c b/src/os2Stubs.c
index 6e3c4655..4fa953cf 100644
--- a/src/os2Stubs.c
+++ b/src/os2Stubs.c
@@ -28,7 +28,7 @@
*
*/
-/* $XFree86: xc/lib/X11/os2Stubs.c,v 3.1 2002/05/31 18:45:42 dawes Exp $ */
+/* $XFree86: xc/lib/X11/os2Stubs.c,v 3.0 1996/05/13 06:37:17 dawes Exp $ */
/* A few OS/2 functions needed in the X11 lib. Mainly, the file path redirection
* functions and the "optimized" select() for the clients */
diff --git a/src/udcInf.c b/src/udcInf.c
index 126511ed..b2a01727 100644
--- a/src/udcInf.c
+++ b/src/udcInf.c
@@ -33,7 +33,7 @@ from The Open Group.
*
*/
-/* $XFree86: xc/lib/X11/udcInf.c,v 1.7 2001/12/14 19:54:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/udcInf.c,v 1.6 2001/01/17 19:41:57 dawes Exp $ */
#include <stdio.h>
#include <locale.h>
diff --git a/src/util/makekeys.c b/src/util/makekeys.c
index ee3aefae..768f5e8b 100644
--- a/src/util/makekeys.c
+++ b/src/util/makekeys.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.7 2001/12/14 19:54:32 dawes Exp $ */
+/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.6 2001/07/25 15:04:48 dawes Exp $ */
/* Constructs hash tables for XStringToKeysym and XKeysymToString. */
diff --git a/src/xcms/AddDIC.c b/src/xcms/AddDIC.c
index 02b31940..22364bec 100644
--- a/src/xcms/AddDIC.c
+++ b/src/xcms/AddDIC.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/AddDIC.c,v 1.2 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/AddSF.c b/src/xcms/AddSF.c
index 9fab20fe..39601c2b 100644
--- a/src/xcms/AddSF.c
+++ b/src/xcms/AddSF.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/AddSF.c,v 1.2 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c
index c4e82820..20cd3840 100644
--- a/src/xcms/CCC.c
+++ b/src/xcms/CCC.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/CCC.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CCC.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
/*
diff --git a/src/xcms/Cv.h b/src/xcms/Cv.h
new file mode 100644
index 00000000..a887e9d2
--- /dev/null
+++ b/src/xcms/Cv.h
@@ -0,0 +1,190 @@
+/* $XFree86: xc/lib/X11/Cv.h,v 1.1 2003/04/13 19:22:15 dawes Exp $ */
+
+#ifndef _CV_H_
+#define _CV_H_
+
+/* variables */
+extern const char _XcmsCIEXYZ_prefix[];
+extern const char _XcmsCIEuvY_prefix[];
+extern const char _XcmsCIExyY_prefix[];
+extern const char _XcmsCIELab_prefix[];
+extern const char _XcmsCIELuv_prefix[];
+extern const char _XcmsTekHVC_prefix[];
+extern const char _XcmsRGBi_prefix[];
+extern const char _XcmsRGB_prefix[];
+
+extern XcmsColorSpace XcmsUNDEFINEDColorSpace;
+extern XcmsColorSpace XcmsTekHVCColorSpace;
+extern XcmsColorSpace XcmsCIEXYZColorSpace;
+extern XcmsColorSpace XcmsCIEuvYColorSpace;
+extern XcmsColorSpace XcmsCIExyYColorSpace;
+extern XcmsColorSpace XcmsCIELabColorSpace;
+extern XcmsColorSpace XcmsCIELuvColorSpace;
+extern XcmsColorSpace XcmsRGBColorSpace;
+extern XcmsColorSpace XcmsRGBiColorSpace;
+
+extern XcmsColorSpace *_XcmsDIColorSpacesInit[];
+extern XcmsColorSpace **_XcmsDIColorSpaces;
+
+extern XcmsColorSpace *_XcmsDDColorSpacesInit[];
+extern XcmsColorSpace **_XcmsDDColorSpaces;
+
+extern XcmsFunctionSet XcmsLinearRGBFunctionSet;
+
+extern XcmsFunctionSet *_XcmsSCCFuncSetsInit[];
+extern XcmsFunctionSet **_XcmsSCCFuncSets;
+
+extern XcmsRegColorSpaceEntry _XcmsRegColorSpaces[];
+
+/* functions */
+extern XPointer *
+_XcmsCopyPointerArray(
+ XPointer *pap);
+extern void
+_XcmsFreePointerArray(
+ XPointer *pap);
+extern XPointer *
+_XcmsPushPointerArray(
+ XPointer *pap,
+ XPointer p,
+ XPointer *papNoFree);
+extern Status
+_XcmsCIEXYZ_ValidSpec(
+ XcmsColor *pColor);
+extern Status
+_XcmsCIEuvY_ValidSpec(
+ XcmsColor *pColor);
+extern int
+_XcmsTekHVC_CheckModify(
+ XcmsColor *pColor);
+
+extern Status
+_XcmsTekHVCQueryMaxVCRGB(
+ XcmsCCC ccc,
+ XcmsFloat hue,
+ XcmsColor *pColor_return,
+ XcmsRGBi *pRGB_return);
+extern Status
+_XcmsCIELabQueryMaxLCRGB(
+ XcmsCCC ccc,
+ XcmsFloat hue, /* hue in radians */
+ XcmsColor *pColor_return,
+ XcmsRGBi *pRGB_return);
+extern Status
+_XcmsConvertColorsWithWhitePt(
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ XcmsColor *pWhitePt,
+ unsigned int nColors,
+ XcmsColorFormat newFormat,
+ Bool *pCompressed);
+
+extern Status
+_XcmsDIConvertColors(
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ XcmsColor *pWhitePt,
+ unsigned int nColors,
+ XcmsColorFormat newFormat);
+extern Status
+_XcmsDDConvertColors(
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ XcmsColorFormat newFormat,
+ Bool *pCompressed);
+extern XcmsColorFormat
+_XcmsRegFormatOfPrefix(
+ _Xconst char *prefix);
+extern void
+_XColor_to_XcmsRGB(
+ XcmsCCC ccc,
+ XColor *pXColors,
+ XcmsColor *pColors,
+ unsigned int nColors);
+extern Status
+_XcmsSetGetColor(
+ Status (*xColorProc)(
+ Display* /* display */,
+ Colormap /* colormap */,
+ XColor* /* screen_in_out */),
+ Display *dpy,
+ Colormap cmap,
+ XcmsColor *pColors_in_out,
+ XcmsColorFormat result_format,
+ Bool *pCompressed);
+extern Status
+_XcmsSetGetColors(
+ Status (*xColorProc)(
+ Display* /* display */,
+ Colormap /* colormap */,
+ XColor* /* screen_in_out */,
+ int /* nColors */),
+ Display *dpy,
+ Colormap cmap,
+ XcmsColor *pColors_in_out,
+ int nColors,
+ XcmsColorFormat result_format,
+ Bool *pCompressed);
+extern Status
+_XcmsCIELuvQueryMaxLCRGB(
+ XcmsCCC ccc,
+ XcmsFloat hue, /* hue in radians */
+ XcmsColor *pColor_return,
+ XcmsRGBi *pRGB_return);
+
+extern XcmsIntensityMap *
+_XcmsGetIntensityMap(
+ Display *dpy,
+ Visual *visual);
+extern int
+_XcmsInitDefaultCCCs(
+ Display *dpy);
+extern int
+_XcmsInitScrnInfo(
+ register Display *dpy,
+ int screenNumber);
+extern XcmsCmapRec *
+_XcmsCopyCmapRecAndFree(
+ Display *dpy,
+ Colormap src_cmap,
+ Colormap copy_cmap);
+extern void
+_XcmsCopyISOLatin1Lowered(
+ char *dst,
+ const char *src);
+extern int
+_XcmsEqualWhitePts(
+ XcmsCCC ccc, XcmsColor *pWhitePt1, XcmsColor *pWhitePt2);
+extern int
+_XcmsLRGB_InitScrnDefault(
+ Display *dpy,
+ int screenNumber,
+ XcmsPerScrnInfo *pPerScrnInfo);
+extern void
+_XcmsFreeIntensityMaps(
+ Display *dpy);
+extern int
+_XcmsGetProperty(
+ Display *pDpy,
+ Window w,
+ Atom property,
+ int *pFormat,
+ unsigned long *pNItems,
+ unsigned long *pNBytes,
+ char **pValue);
+extern unsigned long
+_XcmsGetElement(
+ int format,
+ char **pValue,
+ unsigned long *pCount);
+extern void
+_XcmsUnresolveColor(
+ XcmsCCC ccc,
+ XcmsColor *pColor);
+extern void
+_XcmsResolveColor(
+ XcmsCCC ccc,
+ XcmsColor *pXcmsColor);
+
+#endif /* _CV_H_ */
diff --git a/src/xcms/CvColW.c b/src/xcms/CvColW.c
index 2ba67f0c..336f606e 100644
--- a/src/xcms/CvColW.c
+++ b/src/xcms/CvColW.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/CvColW.c,v 1.4 2003/04/13 19:22:15 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CvColW.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/CvCols.c b/src/xcms/CvCols.c
index 0062da08..6cd805b9 100644
--- a/src/xcms/CvCols.c
+++ b/src/xcms/CvCols.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/CvCols.c,v 1.5 2003/11/03 03:46:26 dawes Exp $ */
+/* $XFree86: xc/lib/X11/CvCols.c,v 1.4 2003/04/13 19:22:15 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c
index 3ec062ee..cdd7406a 100644
--- a/src/xcms/HVC.c
+++ b/src/xcms/HVC.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
+/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.3.4.1 2004-03-04 17:46:36 eich Exp $ */
/* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
/*
@@ -48,7 +48,7 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/HVC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCGcC.c b/src/xcms/HVCGcC.c
index 356bcc10..dc78bfec 100644
--- a/src/xcms/HVCGcC.c
+++ b/src/xcms/HVCGcC.c
@@ -43,7 +43,7 @@
* Source for XcmsTekHVCClipC() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCGcV.c b/src/xcms/HVCGcV.c
index 5f3a2e80..6b9f92b8 100644
--- a/src/xcms/HVCGcV.c
+++ b/src/xcms/HVCGcV.c
@@ -43,7 +43,7 @@
* Source for XcmsTekHVCClipV() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCGcVC.c b/src/xcms/HVCGcVC.c
index 905161cb..1286a20e 100644
--- a/src/xcms/HVCGcVC.c
+++ b/src/xcms/HVCGcVC.c
@@ -43,7 +43,7 @@
* Source for XcmsTekHVCClipVC() gamut
* compression function.
*/
-/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCMnV.c b/src/xcms/HVCMnV.c
index 055d47bd..c730d088 100644
--- a/src/xcms/HVCMnV.c
+++ b/src/xcms/HVCMnV.c
@@ -43,7 +43,7 @@
* Source for XcmsTekHVCQueryMinV gamut boundary querying routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCMnV.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCMxC.c b/src/xcms/HVCMxC.c
index daa9bf63..636e6d39 100644
--- a/src/xcms/HVCMxC.c
+++ b/src/xcms/HVCMxC.c
@@ -44,7 +44,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.5 2003/07/16 01:38:26 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCMxV.c b/src/xcms/HVCMxV.c
index 1e0d5d38..331651f1 100644
--- a/src/xcms/HVCMxV.c
+++ b/src/xcms/HVCMxV.c
@@ -44,7 +44,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.5 2003/07/16 01:38:26 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCMxVC.c b/src/xcms/HVCMxVC.c
index d00f6d86..18060dba 100644
--- a/src/xcms/HVCMxVC.c
+++ b/src/xcms/HVCMxVC.c
@@ -44,7 +44,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCMxVC.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCMxVs.c b/src/xcms/HVCMxVs.c
index bc21d941..cb843108 100644
--- a/src/xcms/HVCMxVs.c
+++ b/src/xcms/HVCMxVs.c
@@ -43,7 +43,7 @@
* Source for the XcmsTekHVCQueryMaxVSamples() gamut boundary
* querying routine.
*/
-/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/HVCWpAj.c b/src/xcms/HVCWpAj.c
index b1b6f0f8..c61ccbd8 100644
--- a/src/xcms/HVCWpAj.c
+++ b/src/xcms/HVCWpAj.c
@@ -44,7 +44,7 @@
* adjustment of color specifications in the TekHVC color
* space.
*/
-/* $XFree86: xc/lib/X11/HVCWpAj.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/IdOfPr.c b/src/xcms/IdOfPr.c
index b6b45910..99173afa 100644
--- a/src/xcms/IdOfPr.c
+++ b/src/xcms/IdOfPr.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/IdOfPr.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c
index 7c252b6d..6f8c6fb7 100644
--- a/src/xcms/LRGB.c
+++ b/src/xcms/LRGB.c
@@ -35,7 +35,7 @@
* 4. RGB intensity to CIE XYZ
*
*/
-/* $XFree86: xc/lib/X11/LRGB.c,v 3.7 2003/11/03 03:46:26 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LRGB.c,v 3.6 2003/04/13 19:22:16 dawes Exp $ */
#include <stdio.h>
#include <X11/Xos.h>
diff --git a/src/xcms/Lab.c b/src/xcms/Lab.c
index 6395a921..fed6115a 100644
--- a/src/xcms/Lab.c
+++ b/src/xcms/Lab.c
@@ -36,7 +36,7 @@
*
* Note that the range for L* is 0 to 1.
*/
-/* $XFree86: xc/lib/X11/Lab.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Lab.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#include <X11/Xos.h>
diff --git a/src/xcms/LabGcC.c b/src/xcms/LabGcC.c
index c13397a4..306b811a 100644
--- a/src/xcms/LabGcC.c
+++ b/src/xcms/LabGcC.c
@@ -30,7 +30,7 @@
* Source for XcmsCIELabClipuv() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LabGcC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LabGcC.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabGcL.c b/src/xcms/LabGcL.c
index aac8d23e..3311a978 100644
--- a/src/xcms/LabGcL.c
+++ b/src/xcms/LabGcL.c
@@ -30,7 +30,7 @@
* Source for XcmsCIELabClipL() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LabGcL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LabGcL.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabGcLC.c b/src/xcms/LabGcLC.c
index cf2cfca0..85b1b001 100644
--- a/src/xcms/LabGcLC.c
+++ b/src/xcms/LabGcLC.c
@@ -30,7 +30,7 @@
* Source for XcmsCIELabClipLab() gamut
* compression function.
*/
-/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabMnL.c b/src/xcms/LabMnL.c
index 6c76ac91..dd5f5c1b 100644
--- a/src/xcms/LabMnL.c
+++ b/src/xcms/LabMnL.c
@@ -31,7 +31,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LabMnL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LabMnL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabMxC.c b/src/xcms/LabMxC.c
index 337d5a89..d03ed9d8 100644
--- a/src/xcms/LabMxC.c
+++ b/src/xcms/LabMxC.c
@@ -33,7 +33,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LabMxC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LabMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabMxL.c b/src/xcms/LabMxL.c
index 7002a821..32f4bdbe 100644
--- a/src/xcms/LabMxL.c
+++ b/src/xcms/LabMxL.c
@@ -31,7 +31,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LabMxL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LabMxL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabMxLC.c b/src/xcms/LabMxLC.c
index 81f2fa29..e806bb19 100644
--- a/src/xcms/LabMxLC.c
+++ b/src/xcms/LabMxLC.c
@@ -38,7 +38,7 @@
* Fred W. Billmeyer & Max Saltzman, "Principles of Color
* Technology", John Wily & Sons, Inc, 1981.
*/
-/* $XFree86: xc/lib/X11/LabMxLC.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LabWpAj.c b/src/xcms/LabWpAj.c
index 89f576a9..ec2a68d2 100644
--- a/src/xcms/LabWpAj.c
+++ b/src/xcms/LabWpAj.c
@@ -32,7 +32,7 @@
* adjustment of color specifications in the CIE L*a*b* color
* space.
*/
-/* $XFree86: xc/lib/X11/LabWpAj.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/Luv.c b/src/xcms/Luv.c
index 8d149478..17fff09a 100644
--- a/src/xcms/Luv.c
+++ b/src/xcms/Luv.c
@@ -38,7 +38,7 @@
* Fred W. Billmeyer & Max Saltzman, "Principles of Color
* Technology", John Wily & Sons, Inc, 1981.
*/
-/* $XFree86: xc/lib/X11/Luv.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Luv.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include <X11/Xos.h>
#include "Xlibint.h"
diff --git a/src/xcms/LuvGcC.c b/src/xcms/LuvGcC.c
index fdb5dcd2..a945cc8a 100644
--- a/src/xcms/LuvGcC.c
+++ b/src/xcms/LuvGcC.c
@@ -30,7 +30,7 @@
* Source for XcmsCIELuvClipuv() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvGcL.c b/src/xcms/LuvGcL.c
index 1c9d4f5a..e2a0aa13 100644
--- a/src/xcms/LuvGcL.c
+++ b/src/xcms/LuvGcL.c
@@ -30,7 +30,7 @@
* Source for XcmsCIELuvClipL() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvGcLC.c b/src/xcms/LuvGcLC.c
index 157a3de7..c859e37b 100644
--- a/src/xcms/LuvGcLC.c
+++ b/src/xcms/LuvGcLC.c
@@ -30,7 +30,7 @@
* Source for XcmsCIELuvClipLuv() gamut
* compression function.
*/
-/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvMnL.c b/src/xcms/LuvMnL.c
index 3f824025..668365db 100644
--- a/src/xcms/LuvMnL.c
+++ b/src/xcms/LuvMnL.c
@@ -31,7 +31,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvMxC.c b/src/xcms/LuvMxC.c
index 10088bbe..2ff95afb 100644
--- a/src/xcms/LuvMxC.c
+++ b/src/xcms/LuvMxC.c
@@ -33,7 +33,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvMxL.c b/src/xcms/LuvMxL.c
index 327227d6..08d01280 100644
--- a/src/xcms/LuvMxL.c
+++ b/src/xcms/LuvMxL.c
@@ -31,7 +31,7 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvMxLC.c b/src/xcms/LuvMxLC.c
index 3a241a79..bb00b713 100644
--- a/src/xcms/LuvMxLC.c
+++ b/src/xcms/LuvMxLC.c
@@ -38,7 +38,7 @@
* Fred W. Billmeyer & Max Saltzman, "Principles of Color
* Technology", John Wily & Sons, Inc, 1981.
*/
-/* $XFree86: xc/lib/X11/LuvMxLC.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/LuvWpAj.c b/src/xcms/LuvWpAj.c
index 5df6d8b3..f19bfa5c 100644
--- a/src/xcms/LuvWpAj.c
+++ b/src/xcms/LuvWpAj.c
@@ -32,7 +32,7 @@
* adjustment of color specifications in the CIE CIELuv.color
* space.
*/
-/* $XFree86: xc/lib/X11/LuvWpAj.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/PrOfId.c b/src/xcms/PrOfId.c
index 8b5e43a1..84c6166a 100644
--- a/src/xcms/PrOfId.c
+++ b/src/xcms/PrOfId.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/PrOfId.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/QuCol.c b/src/xcms/QuCol.c
index 3f19a676..3c48467b 100644
--- a/src/xcms/QuCol.c
+++ b/src/xcms/QuCol.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/QuCol.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuCol.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/QuCols.c b/src/xcms/QuCols.c
index f2ca1a28..3f4350b1 100644
--- a/src/xcms/QuCols.c
+++ b/src/xcms/QuCols.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/QuCols.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/QuCols.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/SetCCC.c b/src/xcms/SetCCC.c
index 34d09ab9..e8d3a779 100644
--- a/src/xcms/SetCCC.c
+++ b/src/xcms/SetCCC.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/SetCCC.c,v 1.2 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcms.h"
diff --git a/src/xcms/SetGetCols.c b/src/xcms/SetGetCols.c
index 4b425af2..66477652 100644
--- a/src/xcms/SetGetCols.c
+++ b/src/xcms/SetGetCols.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/SetGetCols.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86$ */
/*
* EXTERNAL INCLUDES
diff --git a/src/xcms/StCol.c b/src/xcms/StCol.c
index 0d845b90..5893d65b 100644
--- a/src/xcms/StCol.c
+++ b/src/xcms/StCol.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/StCol.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StCol.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/StCols.c b/src/xcms/StCols.c
index 3d6b9004..8219a7f1 100644
--- a/src/xcms/StCols.c
+++ b/src/xcms/StCols.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/StCols.c,v 1.4 2003/04/13 19:22:18 dawes Exp $ */
+/* $XFree86: xc/lib/X11/StCols.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/UNDEFINED.c b/src/xcms/UNDEFINED.c
index 6c0656a3..520d97a1 100644
--- a/src/xcms/UNDEFINED.c
+++ b/src/xcms/UNDEFINED.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/UNDEFINED.c,v 1.2 2003/04/13 19:22:18 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/XRGB.c b/src/xcms/XRGB.c
index 26d0ef97..f868afcc 100644
--- a/src/xcms/XRGB.c
+++ b/src/xcms/XRGB.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/XRGB.c,v 3.4 2003/04/13 19:22:19 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XRGB.c,v 3.3 2001/07/29 05:01:11 tsi Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/XYZ.c b/src/xcms/XYZ.c
index 7a9c98ef..86b18e10 100644
--- a/src/xcms/XYZ.c
+++ b/src/xcms/XYZ.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/XYZ.c,v 1.4 2003/04/13 19:22:19 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XYZ.c,v 1.3 2001/01/17 19:41:49 dawes Exp $ */
#include <X11/Xos.h>
#include "Xlibint.h"
diff --git a/src/xcms/Xcms.txt b/src/xcms/Xcms.txt
index 25b81498..29069416 100644
--- a/src/xcms/Xcms.txt
+++ b/src/xcms/Xcms.txt
@@ -25,7 +25,7 @@
* DESCRIPTION
* Sample Color Name Database
*
- * $XFree86: xc/lib/X11/Xcms.txt,v 3.2 2003/02/13 03:40:54 dawes Exp $
+ * $XFree86$
*/
diff --git a/src/xcms/Xcmsint.h b/src/xcms/Xcmsint.h
index ca8e057c..1bf02ba2 100644
--- a/src/xcms/Xcmsint.h
+++ b/src/xcms/Xcmsint.h
@@ -29,7 +29,7 @@
* (i.e., for API internal use only)
*
*/
-/* $XFree86: xc/lib/X11/Xcmsint.h,v 3.4 2003/04/13 19:22:19 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Xcmsint.h,v 3.3 2001/07/25 15:04:44 dawes Exp $ */
#ifndef _XCMSINT_H_
#define _XCMSINT_H_
diff --git a/src/xcms/cmsAllCol.c b/src/xcms/cmsAllCol.c
index 0bdeeeb7..4d301485 100644
--- a/src/xcms/cmsAllCol.c
+++ b/src/xcms/cmsAllCol.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.3 2001/01/17 19:41:50 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/cmsAllNCol.c b/src/xcms/cmsAllNCol.c
index ffcb9df3..efbb1e83 100644
--- a/src/xcms/cmsAllNCol.c
+++ b/src/xcms/cmsAllNCol.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.5 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c
index 07134970..acdbb9d7 100644
--- a/src/xcms/cmsCmap.c
+++ b/src/xcms/cmsCmap.c
@@ -33,7 +33,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsCmap.c,v 3.2 2003/04/13 19:22:20 dawes Exp $ */
+/* $XFree86$ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c
index 4699a7b4..9cf05c44 100644
--- a/src/xcms/cmsColNm.c
+++ b/src/xcms/cmsColNm.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
+/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.3.4.1 2004-03-04 17:46:38 eich Exp $ */
/* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
/*
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.12 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.11 2003/04/13 19:22:20 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/cmsGlobls.c b/src/xcms/cmsGlobls.c
index ad4e45fe..2a92a229 100644
--- a/src/xcms/cmsGlobls.c
+++ b/src/xcms/cmsGlobls.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.5 2003/04/13 19:22:20 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.4 2001/01/17 19:41:51 dawes Exp $ */
#include "Xlibint.h"
#include "Xcmsint.h"
diff --git a/src/xcms/cmsInt.c b/src/xcms/cmsInt.c
index 4881a696..ea75c503 100644
--- a/src/xcms/cmsInt.c
+++ b/src/xcms/cmsInt.c
@@ -34,7 +34,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsInt.c,v 1.5 2003/04/17 02:06:31 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsInt.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */
/* #define NEED_EVENTS */
#include <stdio.h>
diff --git a/src/xcms/cmsLkCol.c b/src/xcms/cmsLkCol.c
index ff5e69e3..8b3f5346 100644
--- a/src/xcms/cmsLkCol.c
+++ b/src/xcms/cmsLkCol.c
@@ -32,7 +32,7 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.6 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.5 2003/04/13 19:22:20 dawes Exp $ */
#define NEED_REPLIES
#include <stdio.h>
diff --git a/src/xcms/cmsMath.c b/src/xcms/cmsMath.c
index ce8f7493..04c0aea7 100644
--- a/src/xcms/cmsMath.c
+++ b/src/xcms/cmsMath.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/cmsMath.c,v 3.5 2001/12/14 19:54:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsMath.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */
/*
* Stephen Gildea, MIT X Consortium, January 1991
diff --git a/src/xcms/cmsProp.c b/src/xcms/cmsProp.c
index dfa0307b..7af729a7 100644
--- a/src/xcms/cmsProp.c
+++ b/src/xcms/cmsProp.c
@@ -31,7 +31,7 @@
* This utility routines for manipulating properties.
*
*/
-/* $XFree86: xc/lib/X11/cmsProp.c,v 1.2 2003/04/13 19:22:20 dawes Exp $ */
+/* $XFree86$ */
#include <X11/Xatom.h>
#include "Xlibint.h"
diff --git a/src/xcms/cmsTrig.c b/src/xcms/cmsTrig.c
index f56c5e71..6ff60e9e 100644
--- a/src/xcms/cmsTrig.c
+++ b/src/xcms/cmsTrig.c
@@ -24,7 +24,7 @@
* CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.9 2003/04/13 19:22:20 dawes Exp $ */
+/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.8 2001/10/28 03:32:34 tsi Exp $ */
/*
* It should be pointed out that for simplicity's sake, the
* environment parameters are defined as floating point constants,
diff --git a/src/xcms/uvY.c b/src/xcms/uvY.c
index b90ff686..d589b407 100644
--- a/src/xcms/uvY.c
+++ b/src/xcms/uvY.c
@@ -35,7 +35,7 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/uvY.c,v 1.4 2003/04/13 19:22:22 dawes Exp $ */
+/* $XFree86: xc/lib/X11/uvY.c,v 1.3 2001/01/17 19:41:57 dawes Exp $ */
#include <X11/Xos.h>
#include "Xlibint.h"
diff --git a/src/xcms/xyY.c b/src/xcms/xyY.c
index 8619c27a..749a05bb 100644
--- a/src/xcms/xyY.c
+++ b/src/xcms/xyY.c
@@ -34,7 +34,7 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/xyY.c,v 1.4 2003/04/13 19:22:22 dawes Exp $ */
+/* $XFree86: xc/lib/X11/xyY.c,v 1.3 2001/01/17 19:41:57 dawes Exp $ */
#include <stdio.h>
#include <X11/Xos.h>
diff --git a/src/xkb/XKB.c b/src/xkb/XKB.c
index 8f816955..20936198 100644
--- a/src/xkb/XKB.c
+++ b/src/xkb/XKB.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKB.c,v 1.10 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKB.c,v 1.9 2003/04/17 02:06:31 dawes Exp $ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
index 5bc7f65f..a6fec50f 100644
--- a/src/xkb/XKBAlloc.c
+++ b/src/xkb/XKBAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */
#ifndef XKB_IN_SERVER
diff --git a/src/xkb/XKBBell.c b/src/xkb/XKBBell.c
index a1d4d5fc..4c33b8e2 100644
--- a/src/xkb/XKBBell.c
+++ b/src/xkb/XKBBell.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBBell.c,v 1.2 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index 7ab1f2d3..ba9f53fa 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/XKBBind.c,v 3.20 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBBind.c,v 3.19 2003/05/27 22:26:25 tsi Exp $ */
/* the new monsters ate the old ones */
diff --git a/src/xkb/XKBCompat.c b/src/xkb/XKBCompat.c
index 9a0b8ec4..859e0a0c 100644
--- a/src/xkb/XKBCompat.c
+++ b/src/xkb/XKBCompat.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBCompat.c,v 3.2 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBCtrls.c b/src/xkb/XKBCtrls.c
index 485adc3a..bc58316b 100644
--- a/src/xkb/XKBCtrls.c
+++ b/src/xkb/XKBCtrls.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBCtrls.c,v 1.5 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBCtrls.c,v 1.4 2002/12/10 04:33:48 dawes Exp $ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBCvt.c b/src/xkb/XKBCvt.c
index aa2af394..f2347fa8 100644
--- a/src/xkb/XKBCvt.c
+++ b/src/xkb/XKBCvt.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.35 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.34 2002/10/08 23:31:35 dawes Exp $ */
#include <stdio.h>
#include <sys/types.h>
diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c
index 9562c50a..1bc9a064 100644
--- a/src/xkb/XKBExtDev.c
+++ b/src/xkb/XKBExtDev.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.4 2001/10/28 03:32:33 tsi Exp $ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
index 209631e7..6aa41d06 100644
--- a/src/xkb/XKBGAlloc.c
+++ b/src/xkb/XKBGAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
index 65109d76..f41823f5 100644
--- a/src/xkb/XKBGeom.c
+++ b/src/xkb/XKBGeom.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGeom.c,v 1.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBGeom.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */
#ifdef DEBUG
#include <stdio.h>
diff --git a/src/xkb/XKBGetByName.c b/src/xkb/XKBGetByName.c
index b5785b5d..70258ce0 100644
--- a/src/xkb/XKBGetByName.c
+++ b/src/xkb/XKBGetByName.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGetByName.c,v 1.2 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c
index 4442fe60..71fc7f48 100644
--- a/src/xkb/XKBGetMap.c
+++ b/src/xkb/XKBGetMap.c
@@ -25,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.10 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.9 2003/04/17 02:06:31 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/xkb/XKBList.c b/src/xkb/XKBList.c
index 1f2b6e99..e72ced96 100644
--- a/src/xkb/XKBList.c
+++ b/src/xkb/XKBList.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBList.c,v 1.2 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
index 20def46b..d1fd14f2 100644
--- a/src/xkb/XKBMAlloc.c
+++ b/src/xkb/XKBMAlloc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */
#ifndef XKB_IN_SERVER
diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
index 06660ff8..afc0dbeb 100644
--- a/src/xkb/XKBMisc.c
+++ b/src/xkb/XKBMisc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */
#ifndef XKB_IN_SERVER
diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c
index 9e8326d6..490deff2 100644
--- a/src/xkb/XKBNames.c
+++ b/src/xkb/XKBNames.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBNames.c,v 1.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBNames.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/xkb/XKBRdBuf.c b/src/xkb/XKBRdBuf.c
index 8f688c05..9b84424a 100644
--- a/src/xkb/XKBRdBuf.c
+++ b/src/xkb/XKBRdBuf.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBRdBuf.c,v 1.3 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBRdBuf.c,v 1.2 2001/10/28 03:32:33 tsi Exp $ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c
index d792b5ec..460594fa 100644
--- a/src/xkb/XKBSetGeom.c
+++ b/src/xkb/XKBSetGeom.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBSetGeom.c,v 3.6 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBSetGeom.c,v 3.5 2003/05/27 22:26:25 tsi Exp $ */
#ifdef DEBUG
#include <stdio.h>
diff --git a/src/xkb/XKBSetMap.c b/src/xkb/XKBSetMap.c
index 53bb5666..3e56e98a 100644
--- a/src/xkb/XKBSetMap.c
+++ b/src/xkb/XKBSetMap.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.3 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.2 2001/01/17 19:41:49 dawes Exp $ */
#include <stdio.h>
#define NEED_REPLIES
diff --git a/src/xkb/XKBUse.c b/src/xkb/XKBUse.c
index bfbb9ffa..aea49cb6 100644
--- a/src/xkb/XKBUse.c
+++ b/src/xkb/XKBUse.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBUse.c,v 3.8 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBUse.c,v 3.7 2003/07/07 15:34:21 eich Exp $ */
#include <stdio.h>
#include <ctype.h>
diff --git a/src/xkb/XKBleds.c b/src/xkb/XKBleds.c
index 41b4f414..be6e6a1a 100644
--- a/src/xkb/XKBleds.c
+++ b/src/xkb/XKBleds.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBleds.c,v 1.5 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBleds.c,v 1.4 2003/04/13 19:22:18 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/src/xkb/XKBlibint.h b/src/xkb/XKBlibint.h
index 06d8d484..a154d1bc 100644
--- a/src/xkb/XKBlibint.h
+++ b/src/xkb/XKBlibint.h
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.6 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.5 2003/04/18 18:21:45 torrey Exp $ */
#ifndef _XKBLIBINT_H_
#define _XKBLIBINT_H_
diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
index 01bfb9e3..73b16031 100644
--- a/src/xlibi18n/ICWrap.c
+++ b/src/xlibi18n/ICWrap.c
@@ -64,7 +64,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ICWrap.c,v 1.11 2004/01/04 18:44:46 dawes Exp $ */
+/* $XFree86: xc/lib/X11/ICWrap.c,v 1.10 2003/04/25 14:12:38 tsi Exp $ */
#define NEED_EVENTS
#include "Xlibint.h"
diff --git a/src/xlibi18n/IMWrap.c b/src/xlibi18n/IMWrap.c
index 59524a4b..8cfef782 100644
--- a/src/xlibi18n/IMWrap.c
+++ b/src/xlibi18n/IMWrap.c
@@ -57,7 +57,7 @@ from The Open Group.
*/
-/* $XFree86: xc/lib/X11/IMWrap.c,v 3.9 2003/11/17 22:20:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/IMWrap.c,v 3.8 2001/12/14 19:54:01 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/xlibi18n/XDefaultIMIF.c b/src/xlibi18n/XDefaultIMIF.c
index 5295abe9..6ab3ac6b 100644
--- a/src/xlibi18n/XDefaultIMIF.c
+++ b/src/xlibi18n/XDefaultIMIF.c
@@ -41,7 +41,7 @@ interest in or to any trademark, service mark, logo or trade name of
Sun Microsystems, Inc. or its licensors is granted.
*/
-/* $XFree86: xc/lib/X11/XDefaultIMIF.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XDefaultIMIF.c,v 1.3 2003/04/13 19:22:18 dawes Exp $ */
#include <stdio.h>
#define NEED_EVENTS
diff --git a/src/xlibi18n/XDefaultOMIF.c b/src/xlibi18n/XDefaultOMIF.c
index ce5e4740..9182d6de 100644
--- a/src/xlibi18n/XDefaultOMIF.c
+++ b/src/xlibi18n/XDefaultOMIF.c
@@ -41,7 +41,7 @@ interest in or to any trademark, service mark, logo or trade name of
Sun Microsystems, Inc. or its licensors is granted.
*/
-/* $XFree86: xc/lib/X11/XDefaultOMIF.c,v 1.6 2003/11/17 22:20:09 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XDefaultOMIF.c,v 1.5 2003/04/17 02:39:56 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/xlibi18n/XimImSw.h b/src/xlibi18n/XimImSw.h
index 00e5ef3b..8ad5d287 100644
--- a/src/xlibi18n/XimImSw.h
+++ b/src/xlibi18n/XimImSw.h
@@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86: xc/lib/X11/XimImSw.h,v 1.2 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XIMIMSW_H
#define _XIMIMSW_H
diff --git a/src/xlibi18n/XimThai.h b/src/xlibi18n/XimThai.h
index 0e75e82c..5b2666eb 100644
--- a/src/xlibi18n/XimThai.h
+++ b/src/xlibi18n/XimThai.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/XimThai.h,v 1.6 2003/04/17 02:39:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XimThai.h,v 1.5 2001/12/14 19:54:08 dawes Exp $ */
/*
**++
diff --git a/src/xlibi18n/XimTrInt.h b/src/xlibi18n/XimTrInt.h
index 9bdcba7c..cc1cabfa 100644
--- a/src/xlibi18n/XimTrInt.h
+++ b/src/xlibi18n/XimTrInt.h
@@ -28,7 +28,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86: xc/lib/X11/XimTrInt.h,v 1.2 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XIMTRINT_H
#define _XIMTRINT_H
diff --git a/src/xlibi18n/XimTrX.h b/src/xlibi18n/XimTrX.h
index b269766a..a4378439 100644
--- a/src/xlibi18n/XimTrX.h
+++ b/src/xlibi18n/XimTrX.h
@@ -28,7 +28,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86: xc/lib/X11/XimTrX.h,v 1.2 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86$ */
#ifndef _XIMTRX_H
#define _XIMTRX_H
diff --git a/src/xlibi18n/XimTrans.h b/src/xlibi18n/XimTrans.h
index 03119cd0..f75270b2 100644
--- a/src/xlibi18n/XimTrans.h
+++ b/src/xlibi18n/XimTrans.h
@@ -28,7 +28,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86: xc/lib/X11/XimTrans.h,v 1.4 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XimTrans.h,v 1.3 2003/10/24 15:34:00 tsi Exp $ */
#ifndef _XIMTRANS_H
#define _XIMTRANS_H
diff --git a/src/xlibi18n/Ximint.h b/src/xlibi18n/Ximint.h
index 3809c658..e9bdda24 100644
--- a/src/xlibi18n/Ximint.h
+++ b/src/xlibi18n/Ximint.h
@@ -30,7 +30,7 @@ PERFORMANCE OF THIS SOFTWARE.
makoto@sm.sony.co.jp
******************************************************************/
-/* $XFree86: xc/lib/X11/Ximint.h,v 3.14 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Ximint.h,v 3.13 2003/09/06 14:06:32 pascal Exp $ */
#ifndef _XIMINT_H
#define _XIMINT_H
diff --git a/src/xlibi18n/XimintL.h b/src/xlibi18n/XimintL.h
index 4c93a96c..2d4f6a9e 100644
--- a/src/xlibi18n/XimintL.h
+++ b/src/xlibi18n/XimintL.h
@@ -32,7 +32,7 @@ THIS SOFTWARE.
frankyling@hgrd01.enet.dec.com
******************************************************************/
-/* $XFree86: xc/lib/X11/XimintL.h,v 1.7 2001/01/17 19:41:49 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XimintL.h,v 1.6 2000/12/04 18:49:19 dawes Exp $ */
#ifndef _XIMINTL_H
#define _XIMINTL_H
diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h
index 38c4ed67..f10d9baa 100644
--- a/src/xlibi18n/XimintP.h
+++ b/src/xlibi18n/XimintP.h
@@ -35,7 +35,7 @@ PERFORMANCE OF THIS SOFTWARE.
miyamoto@jrd.dec.com
******************************************************************/
-/* $XFree86: xc/lib/X11/XimintP.h,v 1.8 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XimintP.h,v 1.7 2001/01/17 19:41:49 dawes Exp $ */
#ifndef _XIMINTP_H
#define _XIMINTP_H
diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c
index e4e2d8c1..93abc70a 100644
--- a/src/xlibi18n/XlcDL.c
+++ b/src/xlibi18n/XlcDL.c
@@ -41,8 +41,8 @@ interest in or to any trademark, service mark, logo or trade name of
Sun Microsystems, Inc. or its licensors is granted.
*/
-/* $XFree86: xc/lib/X11/XlcDL.c,v 1.13 2003/11/17 22:20:10 dawes Exp $ */
-/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.3 2004-02-11 17:46:29 eich Exp $ */
+/* $XFree86: xc/lib/X11/XlcDL.c,v 1.12 2003/04/13 19:22:19 dawes Exp $ */
+/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.3.2.1 2004-03-04 17:46:38 eich Exp $ */
#include <stdio.h>
#if defined(hpux)
diff --git a/src/xlibi18n/XlcGeneric.h b/src/xlibi18n/XlcGeneric.h
index 45dd66f9..f1d14e71 100644
--- a/src/xlibi18n/XlcGeneric.h
+++ b/src/xlibi18n/XlcGeneric.h
@@ -31,7 +31,7 @@
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/XlcGeneric.h,v 1.5 2003/04/13 19:22:19 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XlcGeneric.h,v 1.4 2001/07/25 15:04:44 dawes Exp $ */
#ifndef _XLCGENERIC_H_
#define _XLCGENERIC_H_
diff --git a/src/xlibi18n/XlcPubI.h b/src/xlibi18n/XlcPubI.h
index 86a1792f..8441d7f6 100644
--- a/src/xlibi18n/XlcPubI.h
+++ b/src/xlibi18n/XlcPubI.h
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.15 2004/02/11 00:30:44 torrey Exp $ */
+/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.14 2003/11/17 22:20:10 dawes Exp $ */
#ifndef _XLCPUBLICI_H_
#define _XLCPUBLICI_H_
diff --git a/src/xlibi18n/XlcPublic.h b/src/xlibi18n/XlcPublic.h
index 72df4c8e..27595d8a 100644
--- a/src/xlibi18n/XlcPublic.h
+++ b/src/xlibi18n/XlcPublic.h
@@ -31,7 +31,7 @@
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/XlcPublic.h,v 1.12 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XlcPublic.h,v 1.11 2003/04/17 02:06:31 dawes Exp $ */
/*
* Most of this API is documented in i18n/Framework.PS
*/
diff --git a/src/xlibi18n/XlcSL.c b/src/xlibi18n/XlcSL.c
index c3f00056..bcf0a001 100644
--- a/src/xlibi18n/XlcSL.c
+++ b/src/xlibi18n/XlcSL.c
@@ -41,7 +41,7 @@ interest in or to any trademark, service mark, logo or trade name of
Sun Microsystems, Inc. or its licensors is granted.
*/
-/* $XFree86: xc/lib/X11/XlcSL.c,v 1.2 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86$ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/xlibi18n/Xlcint.h b/src/xlibi18n/Xlcint.h
index fe3b8c95..fcc3a65f 100644
--- a/src/xlibi18n/Xlcint.h
+++ b/src/xlibi18n/Xlcint.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Xlcint.h,v 3.17 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Xlcint.h,v 3.16 2003/04/17 02:06:31 dawes Exp $ */
/*
* Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
diff --git a/src/xlibi18n/imKStoUCS.c b/src/xlibi18n/imKStoUCS.c
index 56ec7e2b..3504a74e 100644
--- a/src/xlibi18n/imKStoUCS.c
+++ b/src/xlibi18n/imKStoUCS.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.5 2003/11/17 22:20:11 dawes Exp $ */
+/* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.4 2003/04/29 11:29:18 pascal Exp $ */
#include "Xlibint.h"
#include "Ximint.h"
diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c
index cae3f6f7..2afca02a 100644
--- a/src/xlibi18n/lcCT.c
+++ b/src/xlibi18n/lcCT.c
@@ -36,7 +36,7 @@
* Modifier: Ivan Pascal The XFree86 Project
* Modifier: Bruno Haible The XFree86 Project
*/
-/* $XFree86: xc/lib/X11/lcCT.c,v 3.28 2003/08/04 10:32:20 eich Exp $ */
+/* $XFree86: xc/lib/X11/lcCT.c,v 3.26 2001/10/28 03:32:34 tsi Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcCharSet.c b/src/xlibi18n/lcCharSet.c
index bebbe562..3877495e 100644
--- a/src/xlibi18n/lcCharSet.c
+++ b/src/xlibi18n/lcCharSet.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.9 2001/07/25 15:04:45 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.8 2001/01/17 19:41:53 dawes Exp $ */
#include <stdio.h>
#include "Xlibint.h"
diff --git a/src/xlibi18n/lcConv.c b/src/xlibi18n/lcConv.c
index 2c76f3ee..88ae52f4 100644
--- a/src/xlibi18n/lcConv.c
+++ b/src/xlibi18n/lcConv.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcConv.c,v 1.6 2001/01/17 19:41:53 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcConv.c,v 1.5 2000/12/04 18:49:26 dawes Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcDB.c b/src/xlibi18n/lcDB.c
index 4a88ea3c..2ed5f13a 100644
--- a/src/xlibi18n/lcDB.c
+++ b/src/xlibi18n/lcDB.c
@@ -28,7 +28,7 @@
* This is source code modified by FUJITSU LIMITED under the Joint
* Development Agreement for the CDE/Motif PST.
*/
-/* $XFree86: xc/lib/X11/lcDB.c,v 3.16 2003/05/27 22:26:26 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcDB.c,v 3.15tsi Exp $ */
diff --git a/src/xlibi18n/lcDynamic.c b/src/xlibi18n/lcDynamic.c
index 31948320..e443a056 100644
--- a/src/xlibi18n/lcDynamic.c
+++ b/src/xlibi18n/lcDynamic.c
@@ -32,7 +32,7 @@ from The Open Group.
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/lcDynamic.c,v 1.5 2001/12/14 19:54:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcDynamic.c,v 1.4 2001/01/17 19:41:53 dawes Exp $ */
/*
* A dynamically loaded locale.
diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c
index 5ef493b0..66df63f5 100644
--- a/src/xlibi18n/lcFile.c
+++ b/src/xlibi18n/lcFile.c
@@ -23,7 +23,7 @@
* SOFTWARE.
*
*/
-/* $XFree86: xc/lib/X11/lcFile.c,v 3.33 2003/07/16 01:38:26 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcFile.c,v 3.32 2003/03/25 04:18:09 dawes Exp $ */
#include <stdlib.h>
#include <stdio.h>
diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c
index 8eaf498a..7922928e 100644
--- a/src/xlibi18n/lcGeneric.c
+++ b/src/xlibi18n/lcGeneric.c
@@ -28,7 +28,7 @@
* This is source code modified by FUJITSU LIMITED under the Joint
* Development Agreement for the CDE/Motif PST.
*/
-/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.20 2003/09/24 02:43:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.19 2003/05/27 16:55:27 tsi Exp $ */
#include <stdio.h>
#include "Xlibint.h"
diff --git a/src/xlibi18n/lcInit.c b/src/xlibi18n/lcInit.c
index cfa2b076..d034f4e0 100644
--- a/src/xlibi18n/lcInit.c
+++ b/src/xlibi18n/lcInit.c
@@ -74,7 +74,7 @@ Sun Microsystems, Inc. or its licensors is granted.
* Modifier: Masayoshi Shimamura FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/lcInit.c,v 3.10 2002/11/01 13:43:31 alanh Exp $ */
+/* $XFree86: xc/lib/X11/lcInit.c,v 3.9 2001/11/16 00:52:27 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/xlibi18n/lcPrTxt.c b/src/xlibi18n/lcPrTxt.c
index 9078b9be..3670340c 100644
--- a/src/xlibi18n/lcPrTxt.c
+++ b/src/xlibi18n/lcPrTxt.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.10 2003/05/29 13:22:51 pascal Exp $ */
+/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.9 2003/04/03 22:34:02 dawes Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcPubWrap.c b/src/xlibi18n/lcPubWrap.c
index 936005cb..cbbb65c2 100644
--- a/src/xlibi18n/lcPubWrap.c
+++ b/src/xlibi18n/lcPubWrap.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.5 2001/07/25 15:04:45 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.4 2001/01/17 19:41:55 dawes Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcPublic.c b/src/xlibi18n/lcPublic.c
index 80459d6e..7b5e4230 100644
--- a/src/xlibi18n/lcPublic.c
+++ b/src/xlibi18n/lcPublic.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPublic.c,v 1.12 2003/04/13 19:22:21 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcPublic.c,v 1.11 2001/11/16 00:52:28 dawes Exp $ */
#include <stdio.h>
#include "Xlibint.h"
diff --git a/src/xlibi18n/lcRM.c b/src/xlibi18n/lcRM.c
index 2e0f15cc..23ce80d3 100644
--- a/src/xlibi18n/lcRM.c
+++ b/src/xlibi18n/lcRM.c
@@ -24,7 +24,7 @@
* mopi@osa.ilab.toshiba.co.jp
* Bug fixes: Bruno Haible XFree86 Inc.
*/
-/* $XFree86: xc/lib/X11/lcRM.c,v 1.5 2001/01/17 19:41:55 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcRM.c,v 1.4 2000/11/28 18:49:48 dawes Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcStd.c b/src/xlibi18n/lcStd.c
index b8e5ae4c..81216aaa 100644
--- a/src/xlibi18n/lcStd.c
+++ b/src/xlibi18n/lcStd.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcStd.c,v 1.7 2003/04/17 02:06:32 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcStd.c,v 1.6 2003/04/13 19:22:21 dawes Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcTxtPr.c b/src/xlibi18n/lcTxtPr.c
index 25e03c8a..a58ef48b 100644
--- a/src/xlibi18n/lcTxtPr.c
+++ b/src/xlibi18n/lcTxtPr.c
@@ -23,7 +23,7 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcTxtPr.c,v 3.4 2001/10/28 03:32:35 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcTxtPr.c,v 3.3 2001/01/17 19:41:55 dawes Exp $ */
#include "Xlibint.h"
#include "XlcPubI.h"
diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c
index 972a192d..0994e965 100644
--- a/src/xlibi18n/lcUTF8.c
+++ b/src/xlibi18n/lcUTF8.c
@@ -24,7 +24,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.16 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.15 2002/10/08 23:31:36 dawes Exp $ */
/*
* This file contains:
diff --git a/src/xlibi18n/lcUniConv/8bit_tab_to_h.c b/src/xlibi18n/lcUniConv/8bit_tab_to_h.c
index 1d794841..ae5340cf 100644
--- a/src/xlibi18n/lcUniConv/8bit_tab_to_h.c
+++ b/src/xlibi18n/lcUniConv/8bit_tab_to_h.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/8bit_tab_to_h.c,v 1.3 2001/02/09 00:02:54 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/8bit_tab_to_h.c,v 1.2 2000/12/04 18:49:30 dawes Exp $ */
/*
* Generates an 8-bit character set table from a .TXT table as found on
diff --git a/src/xlibi18n/lcUniConv/README b/src/xlibi18n/lcUniConv/README
index 6ce59c7b..5ea4f056 100644
--- a/src/xlibi18n/lcUniConv/README
+++ b/src/xlibi18n/lcUniConv/README
@@ -1,4 +1,4 @@
-$XFree86: xc/lib/X11/lcUniConv/README,v 1.3 2003/10/24 15:34:01 tsi Exp $
+$XFree86$
The files in this directory are taken from the libiconv-1.1 package.
diff --git a/src/xlibi18n/lcUniConv/armscii_8.h b/src/xlibi18n/lcUniConv/armscii_8.h
index 6f8c10c6..6ca102ea 100644
--- a/src/xlibi18n/lcUniConv/armscii_8.h
+++ b/src/xlibi18n/lcUniConv/armscii_8.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/armscii_8.h,v 1.4 2003/07/15 17:33:45 pascal Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/armscii_8.h,v 1.3 2000/11/29 17:40:28 dawes Exp $ */
/*
* ARMSCII-8
diff --git a/src/xlibi18n/lcUniConv/ascii.h b/src/xlibi18n/lcUniConv/ascii.h
index 183de0bb..db8677d7 100644
--- a/src/xlibi18n/lcUniConv/ascii.h
+++ b/src/xlibi18n/lcUniConv/ascii.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/ascii.h,v 1.3 2000/11/29 17:40:28 dawes Exp $ */
+/* $XFree86$ */
/*
* ASCII
diff --git a/src/xlibi18n/lcUniConv/big5.h b/src/xlibi18n/lcUniConv/big5.h
index deff8669..b356b5eb 100644
--- a/src/xlibi18n/lcUniConv/big5.h
+++ b/src/xlibi18n/lcUniConv/big5.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/big5.h,v 1.2 2003/05/27 22:26:28 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/big5.h,v 1.1tsi Exp $ */
/*
* BIG5
diff --git a/src/xlibi18n/lcUniConv/big5_emacs.h b/src/xlibi18n/lcUniConv/big5_emacs.h
index 91475539..4a8f6ed5 100644
--- a/src/xlibi18n/lcUniConv/big5_emacs.h
+++ b/src/xlibi18n/lcUniConv/big5_emacs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/big5_emacs.h,v 1.1 2000/11/28 18:50:06 dawes Exp $ */
+/* $XFree86$ */
/*
* BIG5-0 and BIG5-1
diff --git a/src/xlibi18n/lcUniConv/cjk_tab_to_h.c b/src/xlibi18n/lcUniConv/cjk_tab_to_h.c
index 1335fae7..f3cc1e0e 100644
--- a/src/xlibi18n/lcUniConv/cjk_tab_to_h.c
+++ b/src/xlibi18n/lcUniConv/cjk_tab_to_h.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cjk_tab_to_h.c,v 1.2 2000/12/04 18:49:31 dawes Exp $ */
+/* $XFree86$ */
/*
* Generates a CJK character set table from a .TXT table as found on
diff --git a/src/xlibi18n/lcUniConv/cp1133.h b/src/xlibi18n/lcUniConv/cp1133.h
index da7f5896..8b7ff548 100644
--- a/src/xlibi18n/lcUniConv/cp1133.h
+++ b/src/xlibi18n/lcUniConv/cp1133.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1133.h,v 1.3 2000/11/29 17:40:28 dawes Exp $ */
+/* $XFree86$ */
/*
* IBM-CP1133
diff --git a/src/xlibi18n/lcUniConv/cp1251.h b/src/xlibi18n/lcUniConv/cp1251.h
index f3f7577f..166d5ba8 100644
--- a/src/xlibi18n/lcUniConv/cp1251.h
+++ b/src/xlibi18n/lcUniConv/cp1251.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1251.h,v 1.1 2000/12/04 18:49:32 dawes Exp $ */
+/* $XFree86$ */
/*
* CP1251
diff --git a/src/xlibi18n/lcUniConv/cp1255.h b/src/xlibi18n/lcUniConv/cp1255.h
index 17b843ee..f8e175d8 100644
--- a/src/xlibi18n/lcUniConv/cp1255.h
+++ b/src/xlibi18n/lcUniConv/cp1255.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1255.h,v 1.1 2000/12/04 18:49:33 dawes Exp $ */
+/* $XFree86$ */
/*
* CP1255
diff --git a/src/xlibi18n/lcUniConv/cp1256.h b/src/xlibi18n/lcUniConv/cp1256.h
index 5d4051bf..5097762a 100644
--- a/src/xlibi18n/lcUniConv/cp1256.h
+++ b/src/xlibi18n/lcUniConv/cp1256.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/cp1256.h,v 1.1 2000/12/04 18:49:34 dawes Exp $ */
+/* $XFree86$ */
/*
* CP1256
diff --git a/src/xlibi18n/lcUniConv/gb2312.h b/src/xlibi18n/lcUniConv/gb2312.h
index 3c0c3598..db900a47 100644
--- a/src/xlibi18n/lcUniConv/gb2312.h
+++ b/src/xlibi18n/lcUniConv/gb2312.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/gb2312.h,v 1.5 2003/05/27 22:26:29 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/gb2312.h,v 1.4tsi Exp $ */
/*
* GB2312.1980-0
diff --git a/src/xlibi18n/lcUniConv/georgian_academy.h b/src/xlibi18n/lcUniConv/georgian_academy.h
index a847c52e..23036901 100644
--- a/src/xlibi18n/lcUniConv/georgian_academy.h
+++ b/src/xlibi18n/lcUniConv/georgian_academy.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/georgian_academy.h,v 1.3 2000/11/29 17:40:29 dawes Exp $ */
+/* $XFree86$ */
/*
* GEORGIAN-ACADEMY
diff --git a/src/xlibi18n/lcUniConv/georgian_ps.h b/src/xlibi18n/lcUniConv/georgian_ps.h
index e7220d0a..b7e30bf0 100644
--- a/src/xlibi18n/lcUniConv/georgian_ps.h
+++ b/src/xlibi18n/lcUniConv/georgian_ps.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/georgian_ps.h,v 1.3 2000/11/29 17:40:29 dawes Exp $ */
+/* $XFree86$ */
/*
* GEORGIAN-PS
diff --git a/src/xlibi18n/lcUniConv/iso8859_1.h b/src/xlibi18n/lcUniConv/iso8859_1.h
index a600899f..0b03e702 100644
--- a/src/xlibi18n/lcUniConv/iso8859_1.h
+++ b/src/xlibi18n/lcUniConv/iso8859_1.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_1.h,v 1.3 2000/11/29 17:40:30 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-1
diff --git a/src/xlibi18n/lcUniConv/iso8859_10.h b/src/xlibi18n/lcUniConv/iso8859_10.h
index b63de3eb..f0ef2f69 100644
--- a/src/xlibi18n/lcUniConv/iso8859_10.h
+++ b/src/xlibi18n/lcUniConv/iso8859_10.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_10.h,v 1.3 2000/11/29 17:40:30 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-10
diff --git a/src/xlibi18n/lcUniConv/iso8859_11.h b/src/xlibi18n/lcUniConv/iso8859_11.h
index ced0b3f2..57eb016a 100644
--- a/src/xlibi18n/lcUniConv/iso8859_11.h
+++ b/src/xlibi18n/lcUniConv/iso8859_11.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_11.h,v 1.2 2002/10/09 16:38:19 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/iso8859_11.h,v 1.1tsi Exp $ */
/*
* ISO8859-11
diff --git a/src/xlibi18n/lcUniConv/iso8859_13.h b/src/xlibi18n/lcUniConv/iso8859_13.h
index fe1d767b..7ad1fd2a 100644
--- a/src/xlibi18n/lcUniConv/iso8859_13.h
+++ b/src/xlibi18n/lcUniConv/iso8859_13.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_13.h,v 1.2 2000/11/28 16:10:26 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/iso8859_13.h,v 1.1 2000/06/23 19:50:59 dawes Exp $ */
/*
* ISO-8859-13
diff --git a/src/xlibi18n/lcUniConv/iso8859_14.h b/src/xlibi18n/lcUniConv/iso8859_14.h
index c76c2c2a..7fd322cc 100644
--- a/src/xlibi18n/lcUniConv/iso8859_14.h
+++ b/src/xlibi18n/lcUniConv/iso8859_14.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_14.h,v 1.3 2000/11/29 17:40:30 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-14
diff --git a/src/xlibi18n/lcUniConv/iso8859_15.h b/src/xlibi18n/lcUniConv/iso8859_15.h
index 8c613d7f..209ca21b 100644
--- a/src/xlibi18n/lcUniConv/iso8859_15.h
+++ b/src/xlibi18n/lcUniConv/iso8859_15.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_15.h,v 1.3 2000/11/29 17:40:31 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-15
diff --git a/src/xlibi18n/lcUniConv/iso8859_16.h b/src/xlibi18n/lcUniConv/iso8859_16.h
index 5b3f870f..657e4450 100644
--- a/src/xlibi18n/lcUniConv/iso8859_16.h
+++ b/src/xlibi18n/lcUniConv/iso8859_16.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_16.h,v 1.4 2003/07/15 17:33:45 pascal Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/iso8859_16.h,v 1.3 2000/11/29 17:40:31 dawes Exp $ */
/*
* ISO-8859-16
diff --git a/src/xlibi18n/lcUniConv/iso8859_2.h b/src/xlibi18n/lcUniConv/iso8859_2.h
index 9598d54b..67abd855 100644
--- a/src/xlibi18n/lcUniConv/iso8859_2.h
+++ b/src/xlibi18n/lcUniConv/iso8859_2.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_2.h,v 1.3 2000/11/29 17:40:31 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-2
diff --git a/src/xlibi18n/lcUniConv/iso8859_3.h b/src/xlibi18n/lcUniConv/iso8859_3.h
index 1604c254..399b7906 100644
--- a/src/xlibi18n/lcUniConv/iso8859_3.h
+++ b/src/xlibi18n/lcUniConv/iso8859_3.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_3.h,v 1.3 2000/11/29 17:40:31 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-3
diff --git a/src/xlibi18n/lcUniConv/iso8859_4.h b/src/xlibi18n/lcUniConv/iso8859_4.h
index 6ea62d1c..f787fa85 100644
--- a/src/xlibi18n/lcUniConv/iso8859_4.h
+++ b/src/xlibi18n/lcUniConv/iso8859_4.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_4.h,v 1.3 2000/11/29 17:40:31 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-4
diff --git a/src/xlibi18n/lcUniConv/iso8859_5.h b/src/xlibi18n/lcUniConv/iso8859_5.h
index d4785677..4a2e46e5 100644
--- a/src/xlibi18n/lcUniConv/iso8859_5.h
+++ b/src/xlibi18n/lcUniConv/iso8859_5.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_5.h,v 1.3 2000/11/29 17:40:32 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-5
diff --git a/src/xlibi18n/lcUniConv/iso8859_6.h b/src/xlibi18n/lcUniConv/iso8859_6.h
index 4d57893a..22c66713 100644
--- a/src/xlibi18n/lcUniConv/iso8859_6.h
+++ b/src/xlibi18n/lcUniConv/iso8859_6.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_6.h,v 1.3 2000/11/29 17:40:32 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-6
diff --git a/src/xlibi18n/lcUniConv/iso8859_7.h b/src/xlibi18n/lcUniConv/iso8859_7.h
index 790cec75..2fb38cae 100644
--- a/src/xlibi18n/lcUniConv/iso8859_7.h
+++ b/src/xlibi18n/lcUniConv/iso8859_7.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_7.h,v 1.3 2000/11/29 17:40:32 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-7
diff --git a/src/xlibi18n/lcUniConv/iso8859_8.h b/src/xlibi18n/lcUniConv/iso8859_8.h
index 7b780f02..e9d77a22 100644
--- a/src/xlibi18n/lcUniConv/iso8859_8.h
+++ b/src/xlibi18n/lcUniConv/iso8859_8.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_8.h,v 1.3 2000/11/29 17:40:32 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-8
diff --git a/src/xlibi18n/lcUniConv/iso8859_9.h b/src/xlibi18n/lcUniConv/iso8859_9.h
index 55ec1cb1..662992d0 100644
--- a/src/xlibi18n/lcUniConv/iso8859_9.h
+++ b/src/xlibi18n/lcUniConv/iso8859_9.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_9.h,v 1.3 2000/11/29 17:40:32 dawes Exp $ */
+/* $XFree86$ */
/*
* ISO-8859-9
diff --git a/src/xlibi18n/lcUniConv/iso8859_9e.h b/src/xlibi18n/lcUniConv/iso8859_9e.h
index a5a0b609..17ff75b0 100644
--- a/src/xlibi18n/lcUniConv/iso8859_9e.h
+++ b/src/xlibi18n/lcUniConv/iso8859_9e.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_9e.h,v 1.3 2000/11/28 16:10:28 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/iso8859_9e.h,v 1.2 2000/11/02 19:10:45 dawes Exp $ */
/*
* ISO-8859-9E
diff --git a/src/xlibi18n/lcUniConv/jisx0201.h b/src/xlibi18n/lcUniConv/jisx0201.h
index 4a30f284..fec138a4 100644
--- a/src/xlibi18n/lcUniConv/jisx0201.h
+++ b/src/xlibi18n/lcUniConv/jisx0201.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/jisx0201.h,v 1.3 2000/11/29 17:40:33 dawes Exp $ */
+/* $XFree86$ */
/*
* JISX0201.1976-0
diff --git a/src/xlibi18n/lcUniConv/jisx0208.h b/src/xlibi18n/lcUniConv/jisx0208.h
index 9c080522..4d8a8918 100644
--- a/src/xlibi18n/lcUniConv/jisx0208.h
+++ b/src/xlibi18n/lcUniConv/jisx0208.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/jisx0208.h,v 1.6 2003/05/27 22:26:31 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/jisx0208.h,v 1.5tsi Exp $ */
/*
* JISX0208.1990-0
diff --git a/src/xlibi18n/lcUniConv/jisx0212.h b/src/xlibi18n/lcUniConv/jisx0212.h
index a4857b9b..6c89ee63 100644
--- a/src/xlibi18n/lcUniConv/jisx0212.h
+++ b/src/xlibi18n/lcUniConv/jisx0212.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/jisx0212.h,v 1.5 2003/05/27 22:26:31 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/jisx0212.h,v 1.4tsi Exp $ */
/*
* JISX0212.1990-0
diff --git a/src/xlibi18n/lcUniConv/koi8_c.h b/src/xlibi18n/lcUniConv/koi8_c.h
index e31c3684..504c2589 100644
--- a/src/xlibi18n/lcUniConv/koi8_c.h
+++ b/src/xlibi18n/lcUniConv/koi8_c.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/koi8_c.h,v 1.2 2000/11/28 16:10:29 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/koi8_c.h,v 1.1 2000/10/27 20:26:08 dawes Exp $ */
/*
* KOI8-C
diff --git a/src/xlibi18n/lcUniConv/koi8_r.h b/src/xlibi18n/lcUniConv/koi8_r.h
index a0d3d9b2..dfbbb8dc 100644
--- a/src/xlibi18n/lcUniConv/koi8_r.h
+++ b/src/xlibi18n/lcUniConv/koi8_r.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/koi8_r.h,v 1.3 2000/11/29 17:40:34 dawes Exp $ */
+/* $XFree86$ */
/*
* KOI8-R
diff --git a/src/xlibi18n/lcUniConv/koi8_u.h b/src/xlibi18n/lcUniConv/koi8_u.h
index 43457afd..168d6a10 100644
--- a/src/xlibi18n/lcUniConv/koi8_u.h
+++ b/src/xlibi18n/lcUniConv/koi8_u.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/koi8_u.h,v 1.3 2000/11/29 17:40:34 dawes Exp $ */
+/* $XFree86$ */
/*
* KOI8-U
diff --git a/src/xlibi18n/lcUniConv/ksc5601.h b/src/xlibi18n/lcUniConv/ksc5601.h
index 62ac66d7..7e2a4623 100644
--- a/src/xlibi18n/lcUniConv/ksc5601.h
+++ b/src/xlibi18n/lcUniConv/ksc5601.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/ksc5601.h,v 1.5 2003/05/27 22:26:34 tsi Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/ksc5601.h,v 1.4tsi Exp $ */
/*
* KSC5601.1987-0
diff --git a/src/xlibi18n/lcUniConv/mulelao.h b/src/xlibi18n/lcUniConv/mulelao.h
index 2afd7b51..0e331f81 100644
--- a/src/xlibi18n/lcUniConv/mulelao.h
+++ b/src/xlibi18n/lcUniConv/mulelao.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/mulelao.h,v 1.3 2000/11/29 17:40:35 dawes Exp $ */
+/* $XFree86$ */
/*
* MULELAO-1
diff --git a/src/xlibi18n/lcUniConv/tatar_cyr.h b/src/xlibi18n/lcUniConv/tatar_cyr.h
index 53607005..5783fd92 100644
--- a/src/xlibi18n/lcUniConv/tatar_cyr.h
+++ b/src/xlibi18n/lcUniConv/tatar_cyr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/tatar_cyr.h,v 1.3 2000/12/04 18:49:42 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/tatar_cyr.h,v 1.2 2000/11/28 16:10:31 dawes Exp $ */
/*
* TATAR-CYR
diff --git a/src/xlibi18n/lcUniConv/tcvn.h b/src/xlibi18n/lcUniConv/tcvn.h
index f3d49755..eb80ab3f 100644
--- a/src/xlibi18n/lcUniConv/tcvn.h
+++ b/src/xlibi18n/lcUniConv/tcvn.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/tcvn.h,v 1.3 2000/11/29 17:40:35 dawes Exp $ */
+/* $XFree86$ */
/*
* TCVN-5712
diff --git a/src/xlibi18n/lcUniConv/tis620.h b/src/xlibi18n/lcUniConv/tis620.h
index beb7cd95..deda9769 100644
--- a/src/xlibi18n/lcUniConv/tis620.h
+++ b/src/xlibi18n/lcUniConv/tis620.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/tis620.h,v 1.4 2001/02/09 00:02:54 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/tis620.h,v 1.3 2000/11/29 17:40:35 dawes Exp $ */
/*
* TIS620-0
diff --git a/src/xlibi18n/lcUniConv/ucs2be.h b/src/xlibi18n/lcUniConv/ucs2be.h
index af2a586b..ff9acc39 100644
--- a/src/xlibi18n/lcUniConv/ucs2be.h
+++ b/src/xlibi18n/lcUniConv/ucs2be.h
@@ -1,7 +1,7 @@
/*
* UCS-2BE = UCS-2 big endian
*/
-/* $XFree86: xc/lib/X11/lcUniConv/ucs2be.h,v 1.1 2000/11/28 17:25:09 dawes Exp $ */
+/* $XFree86$ */
static int
ucs2be_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
diff --git a/src/xlibi18n/lcUniConv/utf8.h b/src/xlibi18n/lcUniConv/utf8.h
index fe189cc2..f8c2a7d8 100644
--- a/src/xlibi18n/lcUniConv/utf8.h
+++ b/src/xlibi18n/lcUniConv/utf8.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/utf8.h,v 1.3 2000/11/28 18:50:07 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUniConv/utf8.h,v 1.2 2000/11/28 16:10:32 dawes Exp $ */
/*
* UTF-8
diff --git a/src/xlibi18n/lcUniConv/viscii.h b/src/xlibi18n/lcUniConv/viscii.h
index 9dffbf05..f7dfd447 100644
--- a/src/xlibi18n/lcUniConv/viscii.h
+++ b/src/xlibi18n/lcUniConv/viscii.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/X11/lcUniConv/viscii.h,v 1.3 2000/11/29 17:40:35 dawes Exp $ */
+/* $XFree86$ */
/*
* VISCII1.1-1
diff --git a/src/xlibi18n/lcUtil.c b/src/xlibi18n/lcUtil.c
index d2753368..fb159098 100644
--- a/src/xlibi18n/lcUtil.c
+++ b/src/xlibi18n/lcUtil.c
@@ -24,7 +24,7 @@
* mopi@osa.ilab.toshiba.co.jp
* Bug fixes: Bruno Haible XFree86 Inc.
*/
-/* $XFree86: xc/lib/X11/lcUtil.c,v 1.4 2001/01/17 19:41:55 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcUtil.c,v 1.3 2000/11/29 17:40:24 dawes Exp $ */
#include <X11/Xlib.h>
#include "XlcPublic.h"
diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c
index ef203420..e489d6a4 100644
--- a/src/xlibi18n/lcWrap.c
+++ b/src/xlibi18n/lcWrap.c
@@ -53,7 +53,7 @@ from The Open Group.
*
* Katsuhisa Yano TOSHIBA Corp.
*/
-/* $XFree86: xc/lib/X11/lcWrap.c,v 3.16 2003/04/17 02:06:32 dawes Exp $ */
+/* $XFree86: xc/lib/X11/lcWrap.c,v 3.15 2003/04/13 19:22:22 dawes Exp $ */
#include <stdlib.h>
#include "Xlibint.h"
diff --git a/src/xlibi18n/mbWMProps.c b/src/xlibi18n/mbWMProps.c
index 637ffeed..44f38139 100644
--- a/src/xlibi18n/mbWMProps.c
+++ b/src/xlibi18n/mbWMProps.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/mbWMProps.c,v 1.6 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/mbWMProps.c,v 1.5 2001/12/14 19:54:10 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
diff --git a/src/xlibi18n/mbWrap.c b/src/xlibi18n/mbWrap.c
index 07099f7a..6eca32fc 100644
--- a/src/xlibi18n/mbWrap.c
+++ b/src/xlibi18n/mbWrap.c
@@ -50,7 +50,7 @@ from The Open Group.
*
* M. Collins OSF
*/
-/* $XFree86: xc/lib/X11/mbWrap.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/mbWrap.c,v 1.6 2001/12/14 19:54:10 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/xlibi18n/utf8WMProps.c b/src/xlibi18n/utf8WMProps.c
index 11a224d0..084e3d33 100644
--- a/src/xlibi18n/utf8WMProps.c
+++ b/src/xlibi18n/utf8WMProps.c
@@ -48,7 +48,7 @@ from The Open Group.
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
* OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/X11/utf8WMProps.c,v 1.3 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/utf8WMProps.c,v 1.2 2001/12/14 19:54:11 dawes Exp $ */
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
diff --git a/src/xlibi18n/utf8Wrap.c b/src/xlibi18n/utf8Wrap.c
index 70cc8a6e..1a36463d 100644
--- a/src/xlibi18n/utf8Wrap.c
+++ b/src/xlibi18n/utf8Wrap.c
@@ -72,7 +72,7 @@ from The Open Group.
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
* OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/lib/X11/utf8Wrap.c,v 1.4 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/utf8Wrap.c,v 1.3 2001/12/14 19:54:11 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"
diff --git a/src/xlibi18n/wcWrap.c b/src/xlibi18n/wcWrap.c
index 6d8f1aad..d28f9d09 100644
--- a/src/xlibi18n/wcWrap.c
+++ b/src/xlibi18n/wcWrap.c
@@ -51,7 +51,7 @@ from The Open Group.
*
* M. Collins OSF
*/
-/* $XFree86: xc/lib/X11/wcWrap.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */
+/* $XFree86: xc/lib/X11/wcWrap.c,v 1.6 2001/12/14 19:54:11 dawes Exp $ */
#include "Xlibint.h"
#include "Xlcint.h"