aboutsummaryrefslogtreecommitdiff
path: root/libX11/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-20 11:12:52 +0000
committermarha <marha@users.sourceforge.net>2010-01-20 11:12:52 +0000
commit439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9 (patch)
tree793fbb8e2a3630ba56a145f784cbe134800316e7 /libX11/src
parent8bbcd844049eb1296ccd25aca75bf3b08f28facb (diff)
parenta9768b035f2c47be0908520474073cc68d225d8a (diff)
downloadvcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.gz
vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.tar.bz2
vcxsrv-439cac06f0d4f641e9c7c0dd6ae62c98ebfd8fa9.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src')
-rw-r--r--libX11/src/AllCells.c1
-rw-r--r--libX11/src/AllPlanes.c2
-rw-r--r--libX11/src/AllowEv.c2
-rw-r--r--libX11/src/AutoRep.c2
-rw-r--r--libX11/src/Backgnd.c2
-rw-r--r--libX11/src/BdrWidth.c2
-rw-r--r--libX11/src/Bell.c2
-rw-r--r--libX11/src/Border.c2
-rw-r--r--libX11/src/ChAccCon.c2
-rw-r--r--libX11/src/ChActPGb.c2
-rw-r--r--libX11/src/ChClMode.c2
-rw-r--r--libX11/src/ChCmap.c2
-rw-r--r--libX11/src/ChGC.c2
-rw-r--r--libX11/src/ChKeyCon.c2
-rw-r--r--libX11/src/ChPntCon.c2
-rw-r--r--libX11/src/ChProp.c2
-rw-r--r--libX11/src/ChSaveSet.c2
-rw-r--r--libX11/src/ChWAttrs.c2
-rw-r--r--libX11/src/ChWindow.c2
-rw-r--r--libX11/src/ChkIfEv.c2
-rw-r--r--libX11/src/ChkMaskEv.c2
-rw-r--r--libX11/src/ChkTypEv.c2
-rw-r--r--libX11/src/ChkTypWEv.c2
-rw-r--r--libX11/src/ChkWinEv.c2
-rw-r--r--libX11/src/CirWin.c2
-rw-r--r--libX11/src/CirWinDn.c2
-rw-r--r--libX11/src/CirWinUp.c2
-rw-r--r--libX11/src/ClDisplay.c2
-rw-r--r--libX11/src/Clear.c2
-rw-r--r--libX11/src/ClearArea.c2
-rw-r--r--libX11/src/Cmap.h1
-rw-r--r--libX11/src/ConfWind.c2
-rw-r--r--libX11/src/ConnDis.c3
-rw-r--r--libX11/src/Context.c2
-rw-r--r--libX11/src/ConvSel.c2
-rw-r--r--libX11/src/CopyArea.c2
-rw-r--r--libX11/src/CopyCmap.c2
-rw-r--r--libX11/src/CopyGC.c2
-rw-r--r--libX11/src/CopyPlane.c2
-rw-r--r--libX11/src/Cr.h1
-rw-r--r--libX11/src/CrBFData.c2
-rw-r--r--libX11/src/CrCmap.c2
-rw-r--r--libX11/src/CrCursor.c2
-rw-r--r--libX11/src/CrGC.c2
-rw-r--r--libX11/src/CrGlCur.c2
-rw-r--r--libX11/src/CrPFBData.c1
-rw-r--r--libX11/src/CrPixmap.c2
-rw-r--r--libX11/src/CrWindow.c1
-rw-r--r--libX11/src/Cursor.c2
-rw-r--r--libX11/src/DefCursor.c2
-rw-r--r--libX11/src/DelProp.c2
-rw-r--r--libX11/src/Depths.c1
-rw-r--r--libX11/src/DestSubs.c2
-rw-r--r--libX11/src/DestWind.c2
-rw-r--r--libX11/src/DisName.c2
-rw-r--r--libX11/src/DrArc.c2
-rw-r--r--libX11/src/DrArcs.c2
-rw-r--r--libX11/src/DrLine.c2
-rw-r--r--libX11/src/DrLines.c2
-rw-r--r--libX11/src/DrPoint.c2
-rw-r--r--libX11/src/DrPoints.c2
-rw-r--r--libX11/src/DrRect.c2
-rw-r--r--libX11/src/DrRects.c2
-rw-r--r--libX11/src/DrSegs.c2
-rw-r--r--libX11/src/ErrDes.c3
-rw-r--r--libX11/src/ErrHndlr.c2
-rw-r--r--libX11/src/EvToWire.c12
-rw-r--r--libX11/src/FSSaver.c2
-rw-r--r--libX11/src/FSWrap.c2
-rw-r--r--libX11/src/FetchName.c1
-rw-r--r--libX11/src/FillArc.c2
-rw-r--r--libX11/src/FillArcs.c2
-rw-r--r--libX11/src/FillPoly.c2
-rw-r--r--libX11/src/FillRct.c2
-rw-r--r--libX11/src/FillRcts.c2
-rw-r--r--libX11/src/FilterEv.c2
-rw-r--r--libX11/src/Flush.c2
-rw-r--r--libX11/src/Font.c2
-rw-r--r--libX11/src/FontInfo.c2
-rw-r--r--libX11/src/FontNames.c2
-rw-r--r--libX11/src/FreeCmap.c2
-rw-r--r--libX11/src/FreeCols.c2
-rw-r--r--libX11/src/FreeCurs.c2
-rw-r--r--libX11/src/FreeEData.c2
-rw-r--r--libX11/src/FreeGC.c2
-rw-r--r--libX11/src/FreePix.c2
-rw-r--r--libX11/src/GCMisc.c2
-rw-r--r--libX11/src/Geom.c2
-rw-r--r--libX11/src/GetAtomNm.c2
-rw-r--r--libX11/src/GetColor.c2
-rw-r--r--libX11/src/GetDflt.c2
-rw-r--r--libX11/src/GetFPath.c2
-rw-r--r--libX11/src/GetFProp.c1
-rw-r--r--libX11/src/GetGCVals.c1
-rw-r--r--libX11/src/GetGeom.c1
-rw-r--r--libX11/src/GetHColor.c1
-rw-r--r--libX11/src/GetHints.c2
-rw-r--r--libX11/src/GetIFocus.c2
-rw-r--r--libX11/src/GetImage.c2
-rw-r--r--libX11/src/GetKCnt.c2
-rw-r--r--libX11/src/GetMoEv.c1
-rw-r--r--libX11/src/GetNrmHint.c1
-rw-r--r--libX11/src/GetPCnt.c2
-rw-r--r--libX11/src/GetPntMap.c2
-rw-r--r--libX11/src/GetProp.c2
-rw-r--r--libX11/src/GetRGBCMap.c1
-rw-r--r--libX11/src/GetSOwner.c1
-rw-r--r--libX11/src/GetSSaver.c2
-rw-r--r--libX11/src/GetStCmap.c1
-rw-r--r--libX11/src/GetTxtProp.c1
-rw-r--r--libX11/src/GetWAttrs.c1
-rw-r--r--libX11/src/GetWMCMapW.c1
-rw-r--r--libX11/src/GetWMProto.c1
-rw-r--r--libX11/src/GrButton.c2
-rw-r--r--libX11/src/GrKey.c2
-rw-r--r--libX11/src/GrKeybd.c1
-rw-r--r--libX11/src/GrPointer.c1
-rw-r--r--libX11/src/GrServer.c2
-rw-r--r--libX11/src/Host.c28
-rw-r--r--libX11/src/Iconify.c1
-rw-r--r--libX11/src/IfEvent.c2
-rw-r--r--libX11/src/ImText.c2
-rw-r--r--libX11/src/ImText16.c2
-rw-r--r--libX11/src/ImUtil.c2
-rw-r--r--libX11/src/InitExt.c2
-rw-r--r--libX11/src/InsCmap.c2
-rw-r--r--libX11/src/IntAtom.c2
-rw-r--r--libX11/src/Key.h1
-rw-r--r--libX11/src/KeyBind.c2
-rw-r--r--libX11/src/KeysymStr.c2
-rw-r--r--libX11/src/KillCl.c2
-rw-r--r--libX11/src/LiHosts.c26
-rw-r--r--libX11/src/LiICmaps.c2
-rw-r--r--libX11/src/LiProps.c2
-rw-r--r--libX11/src/ListExt.c2
-rw-r--r--libX11/src/LoadFont.c2
-rw-r--r--libX11/src/LockDis.c2
-rw-r--r--libX11/src/LookupCol.c2
-rw-r--r--libX11/src/LowerWin.c2
-rw-r--r--libX11/src/Macros.c2
-rw-r--r--libX11/src/Makefile.am2
-rw-r--r--libX11/src/Makefile.in15
-rw-r--r--libX11/src/MapRaised.c2
-rw-r--r--libX11/src/MapSubs.c2
-rw-r--r--libX11/src/MapWindow.c2
-rw-r--r--libX11/src/MaskEvent.c2
-rw-r--r--libX11/src/Misc.c2
-rw-r--r--libX11/src/ModMap.c2
-rw-r--r--libX11/src/MoveWin.c2
-rw-r--r--libX11/src/NextEvent.c2
-rw-r--r--libX11/src/OCWrap.c2
-rw-r--r--libX11/src/OMWrap.c2
-rw-r--r--libX11/src/OpenDis.c2
-rw-r--r--libX11/src/ParseCmd.c2
-rw-r--r--libX11/src/ParseCol.c2
-rw-r--r--libX11/src/ParseGeom.c2
-rw-r--r--libX11/src/PeekEvent.c2
-rw-r--r--libX11/src/PeekIfEv.c2
-rw-r--r--libX11/src/Pending.c1
-rw-r--r--libX11/src/PixFormats.c1
-rw-r--r--libX11/src/PmapBgnd.c2
-rw-r--r--libX11/src/PmapBord.c2
-rw-r--r--libX11/src/PolyReg.c2
-rw-r--r--libX11/src/PolyTxt.c2
-rw-r--r--libX11/src/PolyTxt16.c2
-rw-r--r--libX11/src/PropAlloc.c2
-rw-r--r--libX11/src/PutBEvent.c2
-rw-r--r--libX11/src/PutImage.c2
-rw-r--r--libX11/src/QuBest.c1
-rw-r--r--libX11/src/QuColor.c2
-rw-r--r--libX11/src/QuColors.c2
-rw-r--r--libX11/src/QuCurShp.c1
-rw-r--r--libX11/src/QuExt.c2
-rw-r--r--libX11/src/QuKeybd.c2
-rw-r--r--libX11/src/QuPntr.c1
-rw-r--r--libX11/src/QuStipShp.c1
-rw-r--r--libX11/src/QuTextE16.c2
-rw-r--r--libX11/src/QuTextExt.c2
-rw-r--r--libX11/src/QuTileShp.c1
-rw-r--r--libX11/src/QuTree.c2
-rw-r--r--libX11/src/Quarks.c2
-rw-r--r--libX11/src/RaiseWin.c2
-rw-r--r--libX11/src/RdBitF.c2
-rw-r--r--libX11/src/RecolorC.c2
-rw-r--r--libX11/src/ReconfWM.c1
-rw-r--r--libX11/src/ReconfWin.c2
-rw-r--r--libX11/src/Region.c2
-rw-r--r--libX11/src/RegstFlt.c2
-rw-r--r--libX11/src/RepWindow.c2
-rw-r--r--libX11/src/RestackWs.c2
-rw-r--r--libX11/src/RotProp.c2
-rw-r--r--libX11/src/ScrResStr.c1
-rw-r--r--libX11/src/SelInput.c2
-rw-r--r--libX11/src/SendEvent.c2
-rw-r--r--libX11/src/SetBack.c2
-rw-r--r--libX11/src/SetCRects.c2
-rw-r--r--libX11/src/SetClMask.c2
-rw-r--r--libX11/src/SetClOrig.c2
-rw-r--r--libX11/src/SetDashes.c2
-rw-r--r--libX11/src/SetFPath.c2
-rw-r--r--libX11/src/SetFont.c2
-rw-r--r--libX11/src/SetFore.c2
-rw-r--r--libX11/src/SetFunc.c2
-rw-r--r--libX11/src/SetHints.c2
-rw-r--r--libX11/src/SetIFocus.c2
-rw-r--r--libX11/src/SetLStyle.c2
-rw-r--r--libX11/src/SetLocale.c3
-rw-r--r--libX11/src/SetNrmHint.c1
-rw-r--r--libX11/src/SetPMask.c2
-rw-r--r--libX11/src/SetPntMap.c2
-rw-r--r--libX11/src/SetRGBCMap.c1
-rw-r--r--libX11/src/SetSOwner.c2
-rw-r--r--libX11/src/SetSSaver.c2
-rw-r--r--libX11/src/SetStCmap.c1
-rw-r--r--libX11/src/SetState.c2
-rw-r--r--libX11/src/SetStip.c2
-rw-r--r--libX11/src/SetTSOrig.c2
-rw-r--r--libX11/src/SetTile.c2
-rw-r--r--libX11/src/SetTxtProp.c1
-rw-r--r--libX11/src/SetWMCMapW.c1
-rw-r--r--libX11/src/SetWMProto.c1
-rw-r--r--libX11/src/StBytes.c2
-rw-r--r--libX11/src/StColor.c2
-rw-r--r--libX11/src/StColors.c2
-rw-r--r--libX11/src/StNColor.c2
-rw-r--r--libX11/src/StName.c2
-rw-r--r--libX11/src/StrKeysym.c2
-rw-r--r--libX11/src/StrToText.c1
-rw-r--r--libX11/src/Sync.c2
-rw-r--r--libX11/src/Synchro.c2
-rw-r--r--libX11/src/Text.c2
-rw-r--r--libX11/src/Text16.c2
-rw-r--r--libX11/src/TextExt.c2
-rw-r--r--libX11/src/TextExt16.c2
-rw-r--r--libX11/src/TextToStr.c2
-rw-r--r--libX11/src/TrCoords.c1
-rw-r--r--libX11/src/UIThrStubs.c1
-rw-r--r--libX11/src/UndefCurs.c2
-rw-r--r--libX11/src/UngrabBut.c2
-rw-r--r--libX11/src/UngrabKbd.c2
-rw-r--r--libX11/src/UngrabKey.c2
-rw-r--r--libX11/src/UngrabPtr.c2
-rw-r--r--libX11/src/UngrabSvr.c2
-rw-r--r--libX11/src/UninsCmap.c2
-rw-r--r--libX11/src/UnldFont.c2
-rw-r--r--libX11/src/UnmapSubs.c2
-rw-r--r--libX11/src/UnmapWin.c2
-rw-r--r--libX11/src/VisUtil.c1
-rw-r--r--libX11/src/WMGeom.c2
-rw-r--r--libX11/src/WMProps.c2
-rw-r--r--libX11/src/WarpPtr.c2
-rw-r--r--libX11/src/WinEvent.c2
-rw-r--r--libX11/src/Window.c2
-rw-r--r--libX11/src/Withdraw.c1
-rw-r--r--libX11/src/WrBitF.c2
-rw-r--r--libX11/src/XErrorDB3
-rw-r--r--libX11/src/XKeysymDB2
-rw-r--r--libX11/src/Xatomtype.h1
-rw-r--r--libX11/src/Xintatom.h1
-rw-r--r--libX11/src/Xintconn.h1
-rw-r--r--libX11/src/XlibAsync.c1
-rw-r--r--libX11/src/XlibInt.c2
-rw-r--r--libX11/src/XomGeneric.h2
-rw-r--r--libX11/src/Xresinternal.h1
-rw-r--r--libX11/src/Xrm.c2
-rw-r--r--libX11/src/XrmI.h1
-rw-r--r--libX11/src/config.h.in6
-rw-r--r--libX11/src/evtomask.c2
-rw-r--r--libX11/src/globals.c2
-rw-r--r--libX11/src/imConv.c2
-rw-r--r--libX11/src/locking.c2
-rw-r--r--libX11/src/locking.h2
-rw-r--r--libX11/src/os2Stubs.c1
-rw-r--r--libX11/src/poly.h1
-rw-r--r--libX11/src/udcInf.c2
-rw-r--r--libX11/src/util/Makefile.am1
-rw-r--r--libX11/src/util/Makefile.in11
-rw-r--r--libX11/src/util/makekeys.c3
-rw-r--r--libX11/src/xcms/AddDIC.c2
-rw-r--r--libX11/src/xcms/AddSF.c2
-rw-r--r--libX11/src/xcms/CCC.c2
-rw-r--r--libX11/src/xcms/Cv.h1
-rw-r--r--libX11/src/xcms/CvColW.c2
-rw-r--r--libX11/src/xcms/CvCols.c2
-rw-r--r--libX11/src/xcms/HVC.c3
-rw-r--r--libX11/src/xcms/HVCGcC.c2
-rw-r--r--libX11/src/xcms/HVCGcV.c2
-rw-r--r--libX11/src/xcms/HVCGcVC.c2
-rw-r--r--libX11/src/xcms/HVCMnV.c2
-rw-r--r--libX11/src/xcms/HVCMxC.c2
-rw-r--r--libX11/src/xcms/HVCMxV.c2
-rw-r--r--libX11/src/xcms/HVCMxVC.c2
-rw-r--r--libX11/src/xcms/HVCMxVs.c2
-rw-r--r--libX11/src/xcms/HVCWpAj.c2
-rw-r--r--libX11/src/xcms/IdOfPr.c2
-rw-r--r--libX11/src/xcms/LRGB.c2
-rw-r--r--libX11/src/xcms/Lab.c2
-rw-r--r--libX11/src/xcms/LabGcC.c2
-rw-r--r--libX11/src/xcms/LabGcL.c2
-rw-r--r--libX11/src/xcms/LabGcLC.c2
-rw-r--r--libX11/src/xcms/LabMnL.c2
-rw-r--r--libX11/src/xcms/LabMxC.c2
-rw-r--r--libX11/src/xcms/LabMxL.c2
-rw-r--r--libX11/src/xcms/LabMxLC.c2
-rw-r--r--libX11/src/xcms/LabWpAj.c2
-rw-r--r--libX11/src/xcms/Luv.c2
-rw-r--r--libX11/src/xcms/LuvGcC.c2
-rw-r--r--libX11/src/xcms/LuvGcL.c2
-rw-r--r--libX11/src/xcms/LuvGcLC.c2
-rw-r--r--libX11/src/xcms/LuvMnL.c2
-rw-r--r--libX11/src/xcms/LuvMxC.c2
-rw-r--r--libX11/src/xcms/LuvMxL.c2
-rw-r--r--libX11/src/xcms/LuvMxLC.c2
-rw-r--r--libX11/src/xcms/LuvWpAj.c2
-rw-r--r--libX11/src/xcms/Makefile.in9
-rw-r--r--libX11/src/xcms/OfCCC.c1
-rw-r--r--libX11/src/xcms/PrOfId.c2
-rw-r--r--libX11/src/xcms/QBlack.c1
-rw-r--r--libX11/src/xcms/QBlue.c1
-rw-r--r--libX11/src/xcms/QGreen.c1
-rw-r--r--libX11/src/xcms/QRed.c1
-rw-r--r--libX11/src/xcms/QWhite.c1
-rw-r--r--libX11/src/xcms/QuCol.c2
-rw-r--r--libX11/src/xcms/QuCols.c2
-rw-r--r--libX11/src/xcms/SetCCC.c2
-rw-r--r--libX11/src/xcms/SetGetCols.c2
-rw-r--r--libX11/src/xcms/StCol.c2
-rw-r--r--libX11/src/xcms/StCols.c2
-rw-r--r--libX11/src/xcms/UNDEFINED.c2
-rw-r--r--libX11/src/xcms/XRGB.c2
-rw-r--r--libX11/src/xcms/XYZ.c2
-rw-r--r--libX11/src/xcms/Xcms.txt1
-rw-r--r--libX11/src/xcms/Xcmsint.h2
-rw-r--r--libX11/src/xcms/cmsAllCol.c2
-rw-r--r--libX11/src/xcms/cmsAllNCol.c2
-rw-r--r--libX11/src/xcms/cmsCmap.c2
-rw-r--r--libX11/src/xcms/cmsColNm.c3
-rw-r--r--libX11/src/xcms/cmsGlobls.c2
-rw-r--r--libX11/src/xcms/cmsInt.c2
-rw-r--r--libX11/src/xcms/cmsLkCol.c2
-rw-r--r--libX11/src/xcms/cmsMath.c2
-rw-r--r--libX11/src/xcms/cmsProp.c2
-rw-r--r--libX11/src/xcms/cmsTrig.c2
-rw-r--r--libX11/src/xcms/uvY.c2
-rw-r--r--libX11/src/xcms/xyY.c2
-rw-r--r--libX11/src/xkb/Makefile.in9
-rw-r--r--libX11/src/xkb/XKB.c2
-rw-r--r--libX11/src/xkb/XKBAlloc.c2
-rw-r--r--libX11/src/xkb/XKBBell.c2
-rw-r--r--libX11/src/xkb/XKBBind.c2
-rw-r--r--libX11/src/xkb/XKBCompat.c2
-rw-r--r--libX11/src/xkb/XKBCtrls.c2
-rw-r--r--libX11/src/xkb/XKBCvt.c2
-rw-r--r--libX11/src/xkb/XKBExtDev.c2
-rw-r--r--libX11/src/xkb/XKBGAlloc.c2
-rw-r--r--libX11/src/xkb/XKBGeom.c2
-rw-r--r--libX11/src/xkb/XKBGetByName.c2
-rw-r--r--libX11/src/xkb/XKBGetMap.c2
-rw-r--r--libX11/src/xkb/XKBList.c2
-rw-r--r--libX11/src/xkb/XKBMAlloc.c2
-rw-r--r--libX11/src/xkb/XKBMisc.c2
-rw-r--r--libX11/src/xkb/XKBNames.c2
-rw-r--r--libX11/src/xkb/XKBRdBuf.c2
-rw-r--r--libX11/src/xkb/XKBSetGeom.c3
-rw-r--r--libX11/src/xkb/XKBSetMap.c2
-rw-r--r--libX11/src/xkb/XKBUse.c2
-rw-r--r--libX11/src/xkb/XKBleds.c2
-rw-r--r--libX11/src/xkb/XKBlibint.h2
-rw-r--r--libX11/src/xlibi18n/ICWrap.c5
-rw-r--r--libX11/src/xlibi18n/IMWrap.c5
-rw-r--r--libX11/src/xlibi18n/Makefile.in9
-rw-r--r--libX11/src/xlibi18n/XDefaultIMIF.c49
-rw-r--r--libX11/src/xlibi18n/XDefaultOMIF.c49
-rw-r--r--libX11/src/xlibi18n/Xaixlcint.h1
-rw-r--r--libX11/src/xlibi18n/XimImSw.h2
-rw-r--r--libX11/src/xlibi18n/XimProto.h1
-rw-r--r--libX11/src/xlibi18n/XimThai.h2
-rw-r--r--libX11/src/xlibi18n/XimTrInt.h47
-rw-r--r--libX11/src/xlibi18n/XimTrX.h49
-rw-r--r--libX11/src/xlibi18n/XimTrans.h49
-rw-r--r--libX11/src/xlibi18n/Ximint.h2
-rw-r--r--libX11/src/xlibi18n/XimintL.h2
-rw-r--r--libX11/src/xlibi18n/XimintP.h49
-rw-r--r--libX11/src/xlibi18n/XlcDL.c50
-rw-r--r--libX11/src/xlibi18n/XlcGeneric.h2
-rw-r--r--libX11/src/xlibi18n/XlcPubI.h2
-rw-r--r--libX11/src/xlibi18n/XlcPublic.h2
-rw-r--r--libX11/src/xlibi18n/XlcSL.c49
-rw-r--r--libX11/src/xlibi18n/Xlcint.h2
-rw-r--r--libX11/src/xlibi18n/imKStoUCS.c1
-rw-r--r--libX11/src/xlibi18n/lcCT.c2
-rw-r--r--libX11/src/xlibi18n/lcCharSet.c2
-rw-r--r--libX11/src/xlibi18n/lcConv.c2
-rw-r--r--libX11/src/xlibi18n/lcDB.c2
-rw-r--r--libX11/src/xlibi18n/lcDynamic.c2
-rw-r--r--libX11/src/xlibi18n/lcFile.c4
-rw-r--r--libX11/src/xlibi18n/lcGeneric.c2
-rw-r--r--libX11/src/xlibi18n/lcInit.c50
-rw-r--r--libX11/src/xlibi18n/lcPrTxt.c2
-rw-r--r--libX11/src/xlibi18n/lcPubWrap.c2
-rw-r--r--libX11/src/xlibi18n/lcPublic.c2
-rw-r--r--libX11/src/xlibi18n/lcRM.c2
-rw-r--r--libX11/src/xlibi18n/lcStd.c2
-rw-r--r--libX11/src/xlibi18n/lcTxtPr.c2
-rw-r--r--libX11/src/xlibi18n/lcUTF8.c2
-rw-r--r--libX11/src/xlibi18n/lcUniConv/8bit_tab_to_h.c1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/README1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/armscii_8.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/ascii.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/big5.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/big5_emacs.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/cjk_tab_to_h.c1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/cp1133.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/cp1251.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/cp1255.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/cp1256.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/gb2312.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/georgian_academy.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/georgian_ps.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_1.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_10.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_11.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_13.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_14.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_15.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_16.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_2.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_3.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_4.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_5.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_6.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_7.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_8.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_9.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/iso8859_9e.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/jisx0201.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/jisx0208.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/jisx0212.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/koi8_c.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/koi8_r.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/koi8_u.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/ksc5601.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/mulelao.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/tatar_cyr.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/tcvn.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/tis620.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/ucs2be.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/utf8.h1
-rw-r--r--libX11/src/xlibi18n/lcUniConv/viscii.h1
-rw-r--r--libX11/src/xlibi18n/lcUtil.c2
-rw-r--r--libX11/src/xlibi18n/lcWrap.c2
-rw-r--r--libX11/src/xlibi18n/mbWMProps.c2
-rw-r--r--libX11/src/xlibi18n/mbWrap.c2
-rw-r--r--libX11/src/xlibi18n/utf8WMProps.c2
-rw-r--r--libX11/src/xlibi18n/utf8Wrap.c2
-rw-r--r--libX11/src/xlibi18n/wcWrap.c2
456 files changed, 378 insertions, 972 deletions
diff --git a/libX11/src/AllCells.c b/libX11/src/AllCells.c
index 9642f73b9..0c188aab4 100644
--- a/libX11/src/AllCells.c
+++ b/libX11/src/AllCells.c
@@ -1,4 +1,3 @@
-/* $Xorg: AllCells.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/AllPlanes.c b/libX11/src/AllPlanes.c
index 9ce9c22ae..7d422a6f4 100644
--- a/libX11/src/AllPlanes.c
+++ b/libX11/src/AllPlanes.c
@@ -1,4 +1,3 @@
-/* $Xorg: AllPlanes.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/AllowEv.c b/libX11/src/AllowEv.c
index c99521351..4a17e7b2d 100644
--- a/libX11/src/AllowEv.c
+++ b/libX11/src/AllowEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: AllowEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/AutoRep.c b/libX11/src/AutoRep.c
index 59434f770..66b4097a8 100644
--- a/libX11/src/AutoRep.c
+++ b/libX11/src/AutoRep.c
@@ -1,4 +1,3 @@
-/* $Xorg: AutoRep.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Backgnd.c b/libX11/src/Backgnd.c
index 46c71ee19..bf7d75f8f 100644
--- a/libX11/src/Backgnd.c
+++ b/libX11/src/Backgnd.c
@@ -1,4 +1,3 @@
-/* $Xorg: Backgnd.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/BdrWidth.c b/libX11/src/BdrWidth.c
index 13bfd73e3..5da8ce772 100644
--- a/libX11/src/BdrWidth.c
+++ b/libX11/src/BdrWidth.c
@@ -1,4 +1,3 @@
-/* $Xorg: BdrWidth.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Bell.c b/libX11/src/Bell.c
index 9b2f7eac4..7da8772cf 100644
--- a/libX11/src/Bell.c
+++ b/libX11/src/Bell.c
@@ -1,4 +1,3 @@
-/* $Xorg: Bell.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Border.c b/libX11/src/Border.c
index 2ac8c05cc..133043a5b 100644
--- a/libX11/src/Border.c
+++ b/libX11/src/Border.c
@@ -1,4 +1,3 @@
-/* $Xorg: Border.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChAccCon.c b/libX11/src/ChAccCon.c
index ecc4b1561..f8d099668 100644
--- a/libX11/src/ChAccCon.c
+++ b/libX11/src/ChAccCon.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChAccCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChActPGb.c b/libX11/src/ChActPGb.c
index f57bdbca9..bebef2b01 100644
--- a/libX11/src/ChActPGb.c
+++ b/libX11/src/ChActPGb.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChActPGb.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChClMode.c b/libX11/src/ChClMode.c
index 7267c2d23..5250a80bc 100644
--- a/libX11/src/ChClMode.c
+++ b/libX11/src/ChClMode.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChClMode.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChCmap.c b/libX11/src/ChCmap.c
index 7fd377830..d9372cdf3 100644
--- a/libX11/src/ChCmap.c
+++ b/libX11/src/ChCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChCmap.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChGC.c b/libX11/src/ChGC.c
index 058c1f63c..8f677dc3a 100644
--- a/libX11/src/ChGC.c
+++ b/libX11/src/ChGC.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChGC.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:53:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChKeyCon.c b/libX11/src/ChKeyCon.c
index 2a02f8606..bcf522340 100644
--- a/libX11/src/ChKeyCon.c
+++ b/libX11/src/ChKeyCon.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChKeyCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChPntCon.c b/libX11/src/ChPntCon.c
index 265079c82..c177c0045 100644
--- a/libX11/src/ChPntCon.c
+++ b/libX11/src/ChPntCon.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChPntCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChProp.c b/libX11/src/ChProp.c
index b8f596a05..b95775128 100644
--- a/libX11/src/ChProp.c
+++ b/libX11/src/ChProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChProp.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:53:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChSaveSet.c b/libX11/src/ChSaveSet.c
index 3276cc1fa..068b042d2 100644
--- a/libX11/src/ChSaveSet.c
+++ b/libX11/src/ChSaveSet.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChSaveSet.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChWAttrs.c b/libX11/src/ChWAttrs.c
index 6b6088e06..25cbcbd05 100644
--- a/libX11/src/ChWAttrs.c
+++ b/libX11/src/ChWAttrs.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChWAttrs.c,v 1.5 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:53:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChWindow.c b/libX11/src/ChWindow.c
index 2eec66016..fbd6e8846 100644
--- a/libX11/src/ChWindow.c
+++ b/libX11/src/ChWindow.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChWindow.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ChkIfEv.c b/libX11/src/ChkIfEv.c
index 66f0c3c98..5c1dd2b9b 100644
--- a/libX11/src/ChkIfEv.c
+++ b/libX11/src/ChkIfEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChkIfEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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$ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ChkMaskEv.c b/libX11/src/ChkMaskEv.c
index 6fb71c9e0..71f724613 100644
--- a/libX11/src/ChkMaskEv.c
+++ b/libX11/src/ChkMaskEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChkMaskEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/10/28 03:32:29 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ChkTypEv.c b/libX11/src/ChkTypEv.c
index f64ebd335..bb1dbe74c 100644
--- a/libX11/src/ChkTypEv.c
+++ b/libX11/src/ChkTypEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChkTypEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.2 2001/10/28 03:32:29 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ChkTypWEv.c b/libX11/src/ChkTypWEv.c
index d791eb255..e2fd6bf48 100644
--- a/libX11/src/ChkTypWEv.c
+++ b/libX11/src/ChkTypWEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChkTypWEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.2 2001/10/28 03:32:29 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ChkWinEv.c b/libX11/src/ChkWinEv.c
index b753c5fd8..683c8f1c9 100644
--- a/libX11/src/ChkWinEv.c
+++ b/libX11/src/ChkWinEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: ChkWinEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/10/28 03:32:30 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/CirWin.c b/libX11/src/CirWin.c
index 76d8820ed..e37a42ade 100644
--- a/libX11/src/CirWin.c
+++ b/libX11/src/CirWin.c
@@ -1,4 +1,3 @@
-/* $Xorg: CirWin.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CirWinDn.c b/libX11/src/CirWinDn.c
index 82cf2c074..f2b54852b 100644
--- a/libX11/src/CirWinDn.c
+++ b/libX11/src/CirWinDn.c
@@ -1,4 +1,3 @@
-/* $Xorg: CirWinDn.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CirWinUp.c b/libX11/src/CirWinUp.c
index ed7647b71..be9f094cd 100644
--- a/libX11/src/CirWinUp.c
+++ b/libX11/src/CirWinUp.c
@@ -1,4 +1,3 @@
-/* $Xorg: CirWinUp.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ClDisplay.c b/libX11/src/ClDisplay.c
index a09f016e4..cc0e3315b 100644
--- a/libX11/src/ClDisplay.c
+++ b/libX11/src/ClDisplay.c
@@ -1,4 +1,3 @@
-/* $Xorg: ClDisplay.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Clear.c b/libX11/src/Clear.c
index 5e381fb7a..63dc64045 100644
--- a/libX11/src/Clear.c
+++ b/libX11/src/Clear.c
@@ -1,4 +1,3 @@
-/* $Xorg: Clear.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ClearArea.c b/libX11/src/ClearArea.c
index 166353391..41fd17c80 100644
--- a/libX11/src/ClearArea.c
+++ b/libX11/src/ClearArea.c
@@ -1,4 +1,3 @@
-/* $Xorg: ClearArea.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Cmap.h b/libX11/src/Cmap.h
index b4312be78..062b5383b 100644
--- a/libX11/src/Cmap.h
+++ b/libX11/src/Cmap.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
#ifndef _CMAP_H_
#define _CMAP_H_
diff --git a/libX11/src/ConfWind.c b/libX11/src/ConfWind.c
index 7f153cbcf..dd55b4422 100644
--- a/libX11/src/ConfWind.c
+++ b/libX11/src/ConfWind.c
@@ -1,4 +1,3 @@
-/* $Xorg: ConfWind.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ConnDis.c b/libX11/src/ConnDis.c
index 0cc170e83..7fa7998e8 100644
--- a/libX11/src/ConnDis.c
+++ b/libX11/src/ConnDis.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.10 2005-07-03 07:00:55 daniels Exp $ */
-/* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -25,7 +23,6 @@ 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.28 2003/12/02 23:33:17 herrb Exp $ */
/*
* This file contains operating system dependencies.
diff --git a/libX11/src/Context.c b/libX11/src/Context.c
index 4c547d7fe..79ae7d66c 100644
--- a/libX11/src/Context.c
+++ b/libX11/src/Context.c
@@ -1,4 +1,3 @@
-/* $Xorg: Context.c,v 1.5 2001/02/09 02:03:31 xorgcvs Exp $ */
/***********************************************************
Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard,
@@ -50,7 +49,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/ConvSel.c b/libX11/src/ConvSel.c
index 76faae291..2dece58b5 100644
--- a/libX11/src/ConvSel.c
+++ b/libX11/src/ConvSel.c
@@ -1,4 +1,3 @@
-/* $Xorg: ConvSel.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
Copyright 1986,1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CopyArea.c b/libX11/src/CopyArea.c
index d32144e1c..582582120 100644
--- a/libX11/src/CopyArea.c
+++ b/libX11/src/CopyArea.c
@@ -1,4 +1,3 @@
-/* $Xorg: CopyArea.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CopyCmap.c b/libX11/src/CopyCmap.c
index 94a9d0184..5444550cd 100644
--- a/libX11/src/CopyCmap.c
+++ b/libX11/src/CopyCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: CopyCmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CopyGC.c b/libX11/src/CopyGC.c
index 9e78c3519..9c71249cf 100644
--- a/libX11/src/CopyGC.c
+++ b/libX11/src/CopyGC.c
@@ -1,4 +1,3 @@
-/* $Xorg: CopyGC.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CopyPlane.c b/libX11/src/CopyPlane.c
index fd512dfe9..818687687 100644
--- a/libX11/src/CopyPlane.c
+++ b/libX11/src/CopyPlane.c
@@ -1,4 +1,3 @@
-/* $Xorg: CopyPlane.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:33 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Cr.h b/libX11/src/Cr.h
index 101817175..800c9ab1c 100644
--- a/libX11/src/Cr.h
+++ b/libX11/src/Cr.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
#ifndef _CR_H_
#define _CR_H_
diff --git a/libX11/src/CrBFData.c b/libX11/src/CrBFData.c
index 844ba92a8..449095690 100644
--- a/libX11/src/CrBFData.c
+++ b/libX11/src/CrBFData.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrBFData.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CrCmap.c b/libX11/src/CrCmap.c
index 4ed67adc5..9904c7dda 100644
--- a/libX11/src/CrCmap.c
+++ b/libX11/src/CrCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:53:59 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CrCursor.c b/libX11/src/CrCursor.c
index 6417b0ebf..c8c174e5f 100644
--- a/libX11/src/CrCursor.c
+++ b/libX11/src/CrCursor.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrCursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CrGC.c b/libX11/src/CrGC.c
index 23fd279fe..11de94c1f 100644
--- a/libX11/src/CrGC.c
+++ b/libX11/src/CrGC.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrGC.c,v 1.5 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.6 2001/12/14 19:53:59 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CrGlCur.c b/libX11/src/CrGlCur.c
index 5d7adde75..4f332836b 100644
--- a/libX11/src/CrGlCur.c
+++ b/libX11/src/CrGlCur.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrGlCur.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.7 2003/04/13 19:22:15 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CrPFBData.c b/libX11/src/CrPFBData.c
index 8ec88abb6..57cd15303 100644
--- a/libX11/src/CrPFBData.c
+++ b/libX11/src/CrPFBData.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrPFBData.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
diff --git a/libX11/src/CrPixmap.c b/libX11/src/CrPixmap.c
index 5656a6c27..cdf312076 100644
--- a/libX11/src/CrPixmap.c
+++ b/libX11/src/CrPixmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrPixmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/CrWindow.c b/libX11/src/CrWindow.c
index ca56d60f9..23f7ddce0 100644
--- a/libX11/src/CrWindow.c
+++ b/libX11/src/CrWindow.c
@@ -1,4 +1,3 @@
-/* $Xorg: CrWindow.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/Cursor.c b/libX11/src/Cursor.c
index 4bacfc970..80b91c36d 100644
--- a/libX11/src/Cursor.c
+++ b/libX11/src/Cursor.c
@@ -1,4 +1,3 @@
-/* $Xorg: Cursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DefCursor.c b/libX11/src/DefCursor.c
index 1715ddb5e..e3cee0649 100644
--- a/libX11/src/DefCursor.c
+++ b/libX11/src/DefCursor.c
@@ -1,4 +1,3 @@
-/* $Xorg: DefCursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986,1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DelProp.c b/libX11/src/DelProp.c
index a108a1ae2..da486b8ef 100644
--- a/libX11/src/DelProp.c
+++ b/libX11/src/DelProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: DelProp.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Depths.c b/libX11/src/Depths.c
index 7285be1c3..f49655cb2 100644
--- a/libX11/src/Depths.c
+++ b/libX11/src/Depths.c
@@ -1,4 +1,3 @@
-/* $Xorg: Depths.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/libX11/src/DestSubs.c b/libX11/src/DestSubs.c
index 236ba66ae..7c6c428be 100644
--- a/libX11/src/DestSubs.c
+++ b/libX11/src/DestSubs.c
@@ -1,4 +1,3 @@
-/* $Xorg: DestSubs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DestWind.c b/libX11/src/DestWind.c
index 221da265e..c1aec893a 100644
--- a/libX11/src/DestWind.c
+++ b/libX11/src/DestWind.c
@@ -1,4 +1,3 @@
-/* $Xorg: DestWind.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DisName.c b/libX11/src/DisName.c
index 385ec39de..87a1e2f0e 100644
--- a/libX11/src/DisName.c
+++ b/libX11/src/DisName.c
@@ -1,4 +1,3 @@
-/* $Xorg: DisName.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86$ */
/* XDisplayName.c */
/*
diff --git a/libX11/src/DrArc.c b/libX11/src/DrArc.c
index 5bc6c4a08..1dc4a07b2 100644
--- a/libX11/src/DrArc.c
+++ b/libX11/src/DrArc.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrArc.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.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/libX11/src/DrArcs.c b/libX11/src/DrArcs.c
index bc3bda367..14405aa3d 100644
--- a/libX11/src/DrArcs.c
+++ b/libX11/src/DrArcs.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrArcs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrLine.c b/libX11/src/DrLine.c
index 29a3ecbfc..3786f5933 100644
--- a/libX11/src/DrLine.c
+++ b/libX11/src/DrLine.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrLine.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrLines.c b/libX11/src/DrLines.c
index bf0529f3b..68071b6b4 100644
--- a/libX11/src/DrLines.c
+++ b/libX11/src/DrLines.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrLines.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrPoint.c b/libX11/src/DrPoint.c
index 6ad067848..5c89b5c63 100644
--- a/libX11/src/DrPoint.c
+++ b/libX11/src/DrPoint.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrPoint.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrPoints.c b/libX11/src/DrPoints.c
index aff96ba68..287fa057d 100644
--- a/libX11/src/DrPoints.c
+++ b/libX11/src/DrPoints.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrPoints.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrRect.c b/libX11/src/DrRect.c
index a707228a1..dadd55ea2 100644
--- a/libX11/src/DrRect.c
+++ b/libX11/src/DrRect.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrRect.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrRects.c b/libX11/src/DrRects.c
index ab257a5f8..7827bf18d 100644
--- a/libX11/src/DrRects.c
+++ b/libX11/src/DrRects.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrRects.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/DrSegs.c b/libX11/src/DrSegs.c
index 78e04846c..93eab4d08 100644
--- a/libX11/src/DrSegs.c
+++ b/libX11/src/DrSegs.c
@@ -1,4 +1,3 @@
-/* $Xorg: DrSegs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ErrDes.c b/libX11/src/ErrDes.c
index 0ec0a9d47..9a5b1805f 100644
--- a/libX11/src/ErrDes.c
+++ b/libX11/src/ErrDes.c
@@ -1,6 +1,4 @@
/*
- * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $
- * $XdotOrg: lib/X11/src/ErrDes.c,v 1.8 2005-08-26 05:16:46 daniels Exp $
*/
/***********************************************************
@@ -49,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/ErrDes.c,v 3.11 2003/08/06 14:03:59 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ErrHndlr.c b/libX11/src/ErrHndlr.c
index 52205fbe6..167a68b1e 100644
--- a/libX11/src/ErrHndlr.c
+++ b/libX11/src/ErrHndlr.c
@@ -1,4 +1,3 @@
-/* $Xorg: ErrHndlr.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.6 2003/04/13 19:22:15 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/EvToWire.c b/libX11/src/EvToWire.c
index 124fb7446..77e70f34a 100644
--- a/libX11/src/EvToWire.c
+++ b/libX11/src/EvToWire.c
@@ -1,4 +1,3 @@
-/* $Xorg: EvToWire.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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
@@ -42,13 +40,15 @@ from The Open Group.
#include "Xlibint.h"
/*
- * reformat a wire event into an XEvent structure of the right type.
+ * Reformat an XEvent structure to a wire event of the right type.
+ * Return True on success. If the type is unrecognized, return what
+ * _XUnknownNativeEvent returns (i.e., False).
*/
Status
_XEventToWire(
-register Display *dpy, /* pointer to display structure */
-register XEvent *re, /* pointer to where event should be reformatted */
-register xEvent *event) /* wire protocol event */
+ register Display *dpy,
+ register XEvent *re, /* in: from */
+ register xEvent *event) /* out: to */
{
switch (event->u.u.type = re->type) {
case KeyPress:
diff --git a/libX11/src/FSSaver.c b/libX11/src/FSSaver.c
index e4c17f89b..3df8ae681 100644
--- a/libX11/src/FSSaver.c
+++ b/libX11/src/FSSaver.c
@@ -1,4 +1,3 @@
-/* $Xorg: FSSaver.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FSWrap.c b/libX11/src/FSWrap.c
index 0ea34894f..a94709365 100644
--- a/libX11/src/FSWrap.c
+++ b/libX11/src/FSWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: FSWrap.c,v 1.5 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
* Copyright 1991 by the Open Software Foundation
@@ -56,7 +55,6 @@ from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FSWrap.c,v 1.8 2003/08/22 19:27:24 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FetchName.c b/libX11/src/FetchName.c
index a04e343f1..22bd4607a 100644
--- a/libX11/src/FetchName.c
+++ b/libX11/src/FetchName.c
@@ -1,4 +1,3 @@
-/* $Xorg: FetchName.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/FillArc.c b/libX11/src/FillArc.c
index 9d8060f44..0f1ad02d1 100644
--- a/libX11/src/FillArc.c
+++ b/libX11/src/FillArc.c
@@ -1,4 +1,3 @@
-/* $Xorg: FillArc.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FillArcs.c b/libX11/src/FillArcs.c
index b66083ca7..62cfabf8f 100644
--- a/libX11/src/FillArcs.c
+++ b/libX11/src/FillArcs.c
@@ -1,4 +1,3 @@
-/* $Xorg: FillArcs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FillPoly.c b/libX11/src/FillPoly.c
index 3ec3545fc..ea162a41e 100644
--- a/libX11/src/FillPoly.c
+++ b/libX11/src/FillPoly.c
@@ -1,4 +1,3 @@
-/* $Xorg: FillPoly.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FillRct.c b/libX11/src/FillRct.c
index 2859ceb5c..4cd104cb1 100644
--- a/libX11/src/FillRct.c
+++ b/libX11/src/FillRct.c
@@ -1,4 +1,3 @@
-/* $Xorg: FillRct.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FillRcts.c b/libX11/src/FillRcts.c
index 1e66d443f..ad334244f 100644
--- a/libX11/src/FillRcts.c
+++ b/libX11/src/FillRcts.c
@@ -1,4 +1,3 @@
-/* $Xorg: FillRcts.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FilterEv.c b/libX11/src/FilterEv.c
index 683ba33d1..2611a7f71 100644
--- a/libX11/src/FilterEv.c
+++ b/libX11/src/FilterEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: FilterEv.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 by OMRON Corporation
@@ -53,7 +52,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FilterEv.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/Flush.c b/libX11/src/Flush.c
index cfdcce830..46168999b 100644
--- a/libX11/src/Flush.c
+++ b/libX11/src/Flush.c
@@ -1,4 +1,3 @@
-/* $Xorg: Flush.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Font.c b/libX11/src/Font.c
index 244cd2d72..b664b8dd1 100644
--- a/libX11/src/Font.c
+++ b/libX11/src/Font.c
@@ -1,4 +1,3 @@
-/* $Xorg: Font.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -27,7 +26,6 @@ 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.17 2003/04/13 19:22:16 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/FontInfo.c b/libX11/src/FontInfo.c
index 796dcccdc..d1e9f023b 100644
--- a/libX11/src/FontInfo.c
+++ b/libX11/src/FontInfo.c
@@ -1,4 +1,3 @@
-/* $Xorg: FontInfo.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.6 2001/12/14 19:54:00 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/FontNames.c b/libX11/src/FontNames.c
index 97a0e7a3d..c073592c4 100644
--- a/libX11/src/FontNames.c
+++ b/libX11/src/FontNames.c
@@ -1,4 +1,3 @@
-/* $Xorg: FontNames.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/FontNames.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/FreeCmap.c b/libX11/src/FreeCmap.c
index 651aa14a5..e2b76fa6f 100644
--- a/libX11/src/FreeCmap.c
+++ b/libX11/src/FreeCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: FreeCmap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:00 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FreeCols.c b/libX11/src/FreeCols.c
index 1002814c5..a8b7f8867 100644
--- a/libX11/src/FreeCols.c
+++ b/libX11/src/FreeCols.c
@@ -1,4 +1,3 @@
-/* $Xorg: FreeCols.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FreeCurs.c b/libX11/src/FreeCurs.c
index 716af157d..89fb577cc 100644
--- a/libX11/src/FreeCurs.c
+++ b/libX11/src/FreeCurs.c
@@ -1,4 +1,3 @@
-/* $Xorg: FreeCurs.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FreeEData.c b/libX11/src/FreeEData.c
index bb4bb2cbe..3a7abca74 100644
--- a/libX11/src/FreeEData.c
+++ b/libX11/src/FreeEData.c
@@ -1,4 +1,3 @@
-/* $Xorg: FreeEData.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FreeGC.c b/libX11/src/FreeGC.c
index 1e67cdc65..ab994bc64 100644
--- a/libX11/src/FreeGC.c
+++ b/libX11/src/FreeGC.c
@@ -1,4 +1,3 @@
-/* $Xorg: FreeGC.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/08/18 02:41:28 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/FreePix.c b/libX11/src/FreePix.c
index 785d66fa4..21367978e 100644
--- a/libX11/src/FreePix.c
+++ b/libX11/src/FreePix.c
@@ -1,4 +1,3 @@
-/* $Xorg: FreePix.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/GCMisc.c b/libX11/src/GCMisc.c
index 1dc45736f..751e27dca 100644
--- a/libX11/src/GCMisc.c
+++ b/libX11/src/GCMisc.c
@@ -1,4 +1,3 @@
-/* $Xorg: GCMisc.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Geom.c b/libX11/src/Geom.c
index ab85b97e9..1da74f1c3 100644
--- a/libX11/src/Geom.c
+++ b/libX11/src/Geom.c
@@ -1,4 +1,3 @@
-/* $Xorg: Geom.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/GetAtomNm.c b/libX11/src/GetAtomNm.c
index 3ef24a12b..169486b06 100644
--- a/libX11/src/GetAtomNm.c
+++ b/libX11/src/GetAtomNm.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetAtomNm.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/08/18 02:41:28 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetColor.c b/libX11/src/GetColor.c
index 1166be5f7..1fa79601b 100644
--- a/libX11/src/GetColor.c
+++ b/libX11/src/GetColor.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetColor.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.6 2003/04/13 19:22:16 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetDflt.c b/libX11/src/GetDflt.c
index 32dbb5a90..dfda1c64d 100644
--- a/libX11/src/GetDflt.c
+++ b/libX11/src/GetDflt.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetDflt.c,v 1.6 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/GetDflt.c,v 3.22 2003/04/13 19:22:16 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/GetFPath.c b/libX11/src/GetFPath.c
index 3a630fe77..484d16276 100644
--- a/libX11/src/GetFPath.c
+++ b/libX11/src/GetFPath.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetFPath.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetFProp.c b/libX11/src/GetFProp.c
index cb0da2dc4..27ec98b72 100644
--- a/libX11/src/GetFProp.c
+++ b/libX11/src/GetFProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetFProp.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GetGCVals.c b/libX11/src/GetGCVals.c
index 2a33b156c..4861739a6 100644
--- a/libX11/src/GetGCVals.c
+++ b/libX11/src/GetGCVals.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetGCVals.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
diff --git a/libX11/src/GetGeom.c b/libX11/src/GetGeom.c
index aeabc00a5..9f55c210b 100644
--- a/libX11/src/GetGeom.c
+++ b/libX11/src/GetGeom.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetGeom.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GetHColor.c b/libX11/src/GetHColor.c
index 6a4a2857d..6bdd4faed 100644
--- a/libX11/src/GetHColor.c
+++ b/libX11/src/GetHColor.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetHColor.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GetHints.c b/libX11/src/GetHints.c
index f52a89222..4800fe793 100644
--- a/libX11/src/GetHints.c
+++ b/libX11/src/GetHints.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetHints.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/GetHints.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/GetIFocus.c b/libX11/src/GetIFocus.c
index 0f7c508d2..815f21bab 100644
--- a/libX11/src/GetIFocus.c
+++ b/libX11/src/GetIFocus.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetIFocus.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetImage.c b/libX11/src/GetImage.c
index 99c8d6e91..602ba6588 100644
--- a/libX11/src/GetImage.c
+++ b/libX11/src/GetImage.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetImage.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:00 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetKCnt.c b/libX11/src/GetKCnt.c
index f0ed3e199..4ac69d16c 100644
--- a/libX11/src/GetKCnt.c
+++ b/libX11/src/GetKCnt.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetKCnt.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetMoEv.c b/libX11/src/GetMoEv.c
index a200f7871..05e2f04d8 100644
--- a/libX11/src/GetMoEv.c
+++ b/libX11/src/GetMoEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetMoEv.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GetNrmHint.c b/libX11/src/GetNrmHint.c
index 62daa84bf..6f328e8fd 100644
--- a/libX11/src/GetNrmHint.c
+++ b/libX11/src/GetNrmHint.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetNrmHint.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca,
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
diff --git a/libX11/src/GetPCnt.c b/libX11/src/GetPCnt.c
index 857f97339..474a69153 100644
--- a/libX11/src/GetPCnt.c
+++ b/libX11/src/GetPCnt.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetPCnt.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:36 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetPntMap.c b/libX11/src/GetPntMap.c
index f3446354e..5f65ffe61 100644
--- a/libX11/src/GetPntMap.c
+++ b/libX11/src/GetPntMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetPntMap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.6 2001/12/14 19:54:01 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetProp.c b/libX11/src/GetProp.c
index 564e1f778..75d772bd0 100644
--- a/libX11/src/GetProp.c
+++ b/libX11/src/GetProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetProp.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/10/28 03:32:30 tsi Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetRGBCMap.c b/libX11/src/GetRGBCMap.c
index 99bdcfbb7..9e227a263 100644
--- a/libX11/src/GetRGBCMap.c
+++ b/libX11/src/GetRGBCMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetRGBCMap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
diff --git a/libX11/src/GetSOwner.c b/libX11/src/GetSOwner.c
index 4a87137b0..2c93f2bd2 100644
--- a/libX11/src/GetSOwner.c
+++ b/libX11/src/GetSOwner.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetSOwner.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GetSSaver.c b/libX11/src/GetSSaver.c
index c587c69c1..f63b4fec5 100644
--- a/libX11/src/GetSSaver.c
+++ b/libX11/src/GetSSaver.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetSSaver.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:37 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/GetStCmap.c b/libX11/src/GetStCmap.c
index bdd57f772..82fb2134e 100644
--- a/libX11/src/GetStCmap.c
+++ b/libX11/src/GetStCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetStCmap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/GetTxtProp.c b/libX11/src/GetTxtProp.c
index 44e983a64..d14505e2e 100644
--- a/libX11/src/GetTxtProp.c
+++ b/libX11/src/GetTxtProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetTxtProp.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
diff --git a/libX11/src/GetWAttrs.c b/libX11/src/GetWAttrs.c
index 852c66ed3..b0af60b7f 100644
--- a/libX11/src/GetWAttrs.c
+++ b/libX11/src/GetWAttrs.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetWAttrs.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GetWMCMapW.c b/libX11/src/GetWMCMapW.c
index b5d481fd4..5d54cc1ce 100644
--- a/libX11/src/GetWMCMapW.c
+++ b/libX11/src/GetWMCMapW.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetWMCMapW.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/GetWMProto.c b/libX11/src/GetWMProto.c
index bb0ff651b..d8f8bdab4 100644
--- a/libX11/src/GetWMProto.c
+++ b/libX11/src/GetWMProto.c
@@ -1,4 +1,3 @@
-/* $Xorg: GetWMProto.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/GrButton.c b/libX11/src/GrButton.c
index 499a51555..621f49a5c 100644
--- a/libX11/src/GrButton.c
+++ b/libX11/src/GrButton.c
@@ -1,4 +1,3 @@
-/* $Xorg: GrButton.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/GrKey.c b/libX11/src/GrKey.c
index 8cd03d93a..d2da5952f 100644
--- a/libX11/src/GrKey.c
+++ b/libX11/src/GrKey.c
@@ -1,4 +1,3 @@
-/* $Xorg: GrKey.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/GrKeybd.c b/libX11/src/GrKeybd.c
index 450a67cc5..f5d37a1de 100644
--- a/libX11/src/GrKeybd.c
+++ b/libX11/src/GrKeybd.c
@@ -1,4 +1,3 @@
-/* $Xorg: GrKeybd.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GrPointer.c b/libX11/src/GrPointer.c
index 9958af491..08d0f287e 100644
--- a/libX11/src/GrPointer.c
+++ b/libX11/src/GrPointer.c
@@ -1,4 +1,3 @@
-/* $Xorg: GrPointer.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/GrServer.c b/libX11/src/GrServer.c
index b3d76416b..11d21e491 100644
--- a/libX11/src/GrServer.c
+++ b/libX11/src/GrServer.c
@@ -1,4 +1,3 @@
-/* $Xorg: GrServer.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Host.c b/libX11/src/Host.c
index a25e275f4..31ce41b8e 100644
--- a/libX11/src/Host.c
+++ b/libX11/src/Host.c
@@ -1,9 +1,6 @@
-/* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
-/* $XdotOrg: lib/X11/src/Host.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */
/*
Copyright 1986, 1998 The Open Group
-Copyright 2004 Sun Microsystems, Inc.
All rights reserved.
@@ -35,7 +32,30 @@ of the copyright holder.
X Window System is a trademark of The Open Group.
*/
-/* $XFree86: xc/lib/X11/Host.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
+
+/*
+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
/* this might be rightly regarded an os dependent file */
diff --git a/libX11/src/Iconify.c b/libX11/src/Iconify.c
index 367b1c706..3831102a2 100644
--- a/libX11/src/Iconify.c
+++ b/libX11/src/Iconify.c
@@ -1,4 +1,3 @@
-/* $Xorg: Iconify.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.
diff --git a/libX11/src/IfEvent.c b/libX11/src/IfEvent.c
index 64c8f465b..e22ee5dd9 100644
--- a/libX11/src/IfEvent.c
+++ b/libX11/src/IfEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: IfEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:01 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ImText.c b/libX11/src/ImText.c
index 97c26a91a..bbdc8377a 100644
--- a/libX11/src/ImText.c
+++ b/libX11/src/ImText.c
@@ -1,4 +1,3 @@
-/* $Xorg: ImText.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:02 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ImText16.c b/libX11/src/ImText16.c
index 3dbe5c13b..3338ec78a 100644
--- a/libX11/src/ImText16.c
+++ b/libX11/src/ImText16.c
@@ -1,4 +1,3 @@
-/* $Xorg: ImText16.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:02 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ImUtil.c b/libX11/src/ImUtil.c
index 35768563d..cd418d885 100644
--- a/libX11/src/ImUtil.c
+++ b/libX11/src/ImUtil.c
@@ -1,4 +1,3 @@
-/* $Xorg: ImUtil.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.12 2003/04/15 22:10:06 herrb Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/InitExt.c b/libX11/src/InitExt.c
index 0e6c94ee6..cb9191de6 100644
--- a/libX11/src/InitExt.c
+++ b/libX11/src/InitExt.c
@@ -1,4 +1,3 @@
-/* $Xorg: InitExt.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/InitExt.c,v 1.7 2001/12/14 19:54:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/InsCmap.c b/libX11/src/InsCmap.c
index 1b59ad5c9..735ab080e 100644
--- a/libX11/src/InsCmap.c
+++ b/libX11/src/InsCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: InsCmap.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/IntAtom.c b/libX11/src/IntAtom.c
index d1e76b0ca..5763ed7c6 100644
--- a/libX11/src/IntAtom.c
+++ b/libX11/src/IntAtom.c
@@ -1,4 +1,3 @@
-/* $Xorg: IntAtom.c,v 1.5 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1990, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/IntAtom.c,v 1.6 2001/12/14 19:54:02 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/Key.h b/libX11/src/Key.h
index a0ca795d9..0fe89ba37 100644
--- a/libX11/src/Key.h
+++ b/libX11/src/Key.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
#ifndef _KEY_H_
#define _KEY_H_
diff --git a/libX11/src/KeyBind.c b/libX11/src/KeyBind.c
index e8becf006..2bf2cb294 100644
--- a/libX11/src/KeyBind.c
+++ b/libX11/src/KeyBind.c
@@ -1,4 +1,3 @@
-/* $Xorg: KeyBind.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.8 2003/05/27 22:26:25 tsi Exp $ */
/* Beware, here be monsters (still under construction... - JG */
diff --git a/libX11/src/KeysymStr.c b/libX11/src/KeysymStr.c
index 269cbdfa9..486b5d156 100644
--- a/libX11/src/KeysymStr.c
+++ b/libX11/src/KeysymStr.c
@@ -1,4 +1,3 @@
-/* $Xorg: KeysymStr.c,v 1.5 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
@@ -25,7 +24,6 @@ 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.9 2003/04/13 19:22:16 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/KillCl.c b/libX11/src/KillCl.c
index 2c72c106a..cfd8cb000 100644
--- a/libX11/src/KillCl.c
+++ b/libX11/src/KillCl.c
@@ -1,4 +1,3 @@
-/* $Xorg: KillCl.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/LiHosts.c b/libX11/src/LiHosts.c
index c1311da26..ae9fa16cf 100644
--- a/libX11/src/LiHosts.c
+++ b/libX11/src/LiHosts.c
@@ -1,9 +1,6 @@
-/* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
-/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */
/*
Copyright 1986, 1998 The Open Group
-Copyright 2004 Sun Microsystems, Inc.
All rights reserved.
@@ -36,6 +33,29 @@ X Window System is a trademark of The Open Group.
*/
+/*
+ * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
/* This can really be considered an os dependent routine */
#define NEED_REPLIES
diff --git a/libX11/src/LiICmaps.c b/libX11/src/LiICmaps.c
index dc74d4991..d2cb221d8 100644
--- a/libX11/src/LiICmaps.c
+++ b/libX11/src/LiICmaps.c
@@ -1,4 +1,3 @@
-/* $Xorg: LiICmaps.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:39 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/LiProps.c b/libX11/src/LiProps.c
index 681959d1c..344f990d3 100644
--- a/libX11/src/LiProps.c
+++ b/libX11/src/LiProps.c
@@ -1,4 +1,3 @@
-/* $Xorg: LiProps.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:39 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ListExt.c b/libX11/src/ListExt.c
index 82d44d7a1..5a41ec35a 100644
--- a/libX11/src/ListExt.c
+++ b/libX11/src/ListExt.c
@@ -1,4 +1,3 @@
-/* $Xorg: ListExt.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:39 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/LoadFont.c b/libX11/src/LoadFont.c
index 30da83a80..f547976ba 100644
--- a/libX11/src/LoadFont.c
+++ b/libX11/src/LoadFont.c
@@ -1,4 +1,3 @@
-/* $Xorg: LoadFont.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/LockDis.c b/libX11/src/LockDis.c
index df121bd2b..12dd97df0 100644
--- a/libX11/src/LockDis.c
+++ b/libX11/src/LockDis.c
@@ -1,4 +1,3 @@
-/* $Xorg: LockDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
@@ -25,7 +24,6 @@ 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$ */
/*
* Author: Stephen Gildea, MIT X Consortium
diff --git a/libX11/src/LookupCol.c b/libX11/src/LookupCol.c
index 1473138e1..04c700e44 100644
--- a/libX11/src/LookupCol.c
+++ b/libX11/src/LookupCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: LookupCol.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.6 2003/04/13 19:22:16 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/LowerWin.c b/libX11/src/LowerWin.c
index 39c8dd190..d430e6fd7 100644
--- a/libX11/src/LowerWin.c
+++ b/libX11/src/LowerWin.c
@@ -1,4 +1,3 @@
-/* $Xorg: LowerWin.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Macros.c b/libX11/src/Macros.c
index 55d88d9ec..42d4cf1c5 100644
--- a/libX11/src/Macros.c
+++ b/libX11/src/Macros.c
@@ -1,4 +1,3 @@
-/* $Xorg: Macros.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am
index 51e1e0660..c2aa8bb16 100644
--- a/libX11/src/Makefile.am
+++ b/libX11/src/Makefile.am
@@ -417,7 +417,7 @@ lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
CLEANFILES += $(lintlib_DATA)
$(LINTLIB): $(libX11_la_SOURCES)
- $(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
+ $(AM_V_GEN)$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
endif MAKE_LINT_LIB
#
diff --git a/libX11/src/Makefile.in b/libX11/src/Makefile.in
index f1b62ffdc..0c153e1c5 100644
--- a/libX11/src/Makefile.in
+++ b/libX11/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -332,6 +332,7 @@ GREP = @GREP@
GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -368,6 +369,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -393,16 +395,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKEYSYMDB = @XKEYSYMDB@
XLOCALEDATADIR = @XLOCALEDATADIR@
XLOCALEDIR = @XLOCALEDIR@
XLOCALELIBDIR = @XLOCALELIBDIR@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -427,7 +425,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -1027,7 +1024,7 @@ uninstall-x11dataDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -1052,7 +1049,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -1359,7 +1356,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
@LINT_TRUE@ done
@MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libX11_la_SOURCES)
-@MAKE_LINT_LIB_TRUE@ $(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
+@MAKE_LINT_LIB_TRUE@ $(AM_V_GEN)$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
diff --git a/libX11/src/MapRaised.c b/libX11/src/MapRaised.c
index d709751b0..6ad6aef08 100644
--- a/libX11/src/MapRaised.c
+++ b/libX11/src/MapRaised.c
@@ -1,4 +1,3 @@
-/* $Xorg: MapRaised.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/MapSubs.c b/libX11/src/MapSubs.c
index 751dd7789..14e8b8af5 100644
--- a/libX11/src/MapSubs.c
+++ b/libX11/src/MapSubs.c
@@ -1,4 +1,3 @@
-/* $Xorg: MapSubs.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/MapWindow.c b/libX11/src/MapWindow.c
index ba1f51907..cc041ff51 100644
--- a/libX11/src/MapWindow.c
+++ b/libX11/src/MapWindow.c
@@ -1,4 +1,3 @@
-/* $Xorg: MapWindow.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/MaskEvent.c b/libX11/src/MaskEvent.c
index 14af00cc0..ec1672b22 100644
--- a/libX11/src/MaskEvent.c
+++ b/libX11/src/MaskEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: MaskEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/10/28 03:32:30 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/Misc.c b/libX11/src/Misc.c
index a34ac6d4d..c3a028408 100644
--- a/libX11/src/Misc.c
+++ b/libX11/src/Misc.c
@@ -1,4 +1,3 @@
-/* $Xorg: Misc.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ModMap.c b/libX11/src/ModMap.c
index 04fe509a6..28c2da5a4 100644
--- a/libX11/src/ModMap.c
+++ b/libX11/src/ModMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: ModMap.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:03 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/MoveWin.c b/libX11/src/MoveWin.c
index 8921ec4ec..3cd75e106 100644
--- a/libX11/src/MoveWin.c
+++ b/libX11/src/MoveWin.c
@@ -1,4 +1,3 @@
-/* $Xorg: MoveWin.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/NextEvent.c b/libX11/src/NextEvent.c
index 1dc8384e4..286579170 100644
--- a/libX11/src/NextEvent.c
+++ b/libX11/src/NextEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: NextEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:40 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/OCWrap.c b/libX11/src/OCWrap.c
index 05774c5ef..fe23a3495 100644
--- a/libX11/src/OCWrap.c
+++ b/libX11/src/OCWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: OCWrap.c,v 1.4 2000/08/17 19:44:47 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/OCWrap.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/OMWrap.c b/libX11/src/OMWrap.c
index fa8e33379..045ca16bc 100644
--- a/libX11/src/OMWrap.c
+++ b/libX11/src/OMWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: OMWrap.c,v 1.4 2000/08/17 19:44:47 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/OMWrap.c,v 1.4 2001/07/25 15:04:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/OpenDis.c b/libX11/src/OpenDis.c
index d6c7b80d5..46e102685 100644
--- a/libX11/src/OpenDis.c
+++ b/libX11/src/OpenDis.c
@@ -1,4 +1,3 @@
-/* $Xorg: OpenDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */
/*
Copyright 1985, 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.16 2003/07/04 16:24:23 eich Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/libX11/src/ParseCmd.c b/libX11/src/ParseCmd.c
index 7d93f7650..677190812 100644
--- a/libX11/src/ParseCmd.c
+++ b/libX11/src/ParseCmd.c
@@ -1,4 +1,3 @@
-/* $Xorg: ParseCmd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/***********************************************************
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.5 2001/12/14 19:54:03 dawes Exp $ */
/* XrmParseCommand()
diff --git a/libX11/src/ParseCol.c b/libX11/src/ParseCol.c
index e500ec6c1..5f9b09f25 100644
--- a/libX11/src/ParseCol.c
+++ b/libX11/src/ParseCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: ParseCol.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.6 2003/04/13 19:22:17 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/ParseGeom.c b/libX11/src/ParseGeom.c
index ba6e45eb9..dfd812fc9 100644
--- a/libX11/src/ParseGeom.c
+++ b/libX11/src/ParseGeom.c
@@ -1,4 +1,3 @@
-/* $Xorg: ParseGeom.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
@@ -27,7 +26,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ParseGeom.c,v 1.3 2001/12/14 19:54:03 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/PeekEvent.c b/libX11/src/PeekEvent.c
index 344fe02b2..3a7aebe28 100644
--- a/libX11/src/PeekEvent.c
+++ b/libX11/src/PeekEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: PeekEvent.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:41 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/PeekIfEv.c b/libX11/src/PeekIfEv.c
index 5105b6a58..3421dd521 100644
--- a/libX11/src/PeekIfEv.c
+++ b/libX11/src/PeekIfEv.c
@@ -1,4 +1,3 @@
-/* $Xorg: PeekIfEv.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:03 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/Pending.c b/libX11/src/Pending.c
index 8ab7b1e7b..eb97060ca 100644
--- a/libX11/src/Pending.c
+++ b/libX11/src/Pending.c
@@ -1,4 +1,3 @@
-/* $Xorg: Pending.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/PixFormats.c b/libX11/src/PixFormats.c
index 684d0c7c4..8e4a10027 100644
--- a/libX11/src/PixFormats.c
+++ b/libX11/src/PixFormats.c
@@ -1,4 +1,3 @@
-/* $Xorg: PixFormats.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/libX11/src/PmapBgnd.c b/libX11/src/PmapBgnd.c
index ee4581e2c..9c5155833 100644
--- a/libX11/src/PmapBgnd.c
+++ b/libX11/src/PmapBgnd.c
@@ -1,4 +1,3 @@
-/* $Xorg: PmapBgnd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:41 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/PmapBord.c b/libX11/src/PmapBord.c
index b0d8f1fd9..7e1be616e 100644
--- a/libX11/src/PmapBord.c
+++ b/libX11/src/PmapBord.c
@@ -1,4 +1,3 @@
-/* $Xorg: PmapBord.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:41 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/PolyReg.c b/libX11/src/PolyReg.c
index 666fc1a29..74c8765fe 100644
--- a/libX11/src/PolyReg.c
+++ b/libX11/src/PolyReg.c
@@ -1,4 +1,3 @@
-/* $Xorg: PolyReg.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/************************************************************************
Copyright 1987, 1998 The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
************************************************************************/
-/* $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/libX11/src/PolyTxt.c b/libX11/src/PolyTxt.c
index 53dd5f888..471383b57 100644
--- a/libX11/src/PolyTxt.c
+++ b/libX11/src/PolyTxt.c
@@ -1,4 +1,3 @@
-/* $Xorg: PolyTxt.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/10/28 03:32:30 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/PolyTxt16.c b/libX11/src/PolyTxt16.c
index 8a11af8a3..dd6581827 100644
--- a/libX11/src/PolyTxt16.c
+++ b/libX11/src/PolyTxt16.c
@@ -1,4 +1,3 @@
-/* $Xorg: PolyTxt16.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/10/28 03:32:31 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/PropAlloc.c b/libX11/src/PropAlloc.c
index 2bcbc8aa1..bad768153 100644
--- a/libX11/src/PropAlloc.c
+++ b/libX11/src/PropAlloc.c
@@ -1,4 +1,3 @@
-/* $Xorg: PropAlloc.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:41 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/PutBEvent.c b/libX11/src/PutBEvent.c
index 03a9cd266..521df407c 100644
--- a/libX11/src/PutBEvent.c
+++ b/libX11/src/PutBEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: PutBEvent.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/PutImage.c b/libX11/src/PutImage.c
index 32223571f..6dad4f13a 100644
--- a/libX11/src/PutImage.c
+++ b/libX11/src/PutImage.c
@@ -1,4 +1,3 @@
-/* $Xorg: PutImage.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.11 2002/12/09 04:10:56 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/QuBest.c b/libX11/src/QuBest.c
index 480a30c62..56b510d67 100644
--- a/libX11/src/QuBest.c
+++ b/libX11/src/QuBest.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuBest.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/QuColor.c b/libX11/src/QuColor.c
index 31dd5a5ee..7aca7d7b8 100644
--- a/libX11/src/QuColor.c
+++ b/libX11/src/QuColor.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuColor.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/QuColors.c b/libX11/src/QuColors.c
index f2203c8be..0df6f028f 100644
--- a/libX11/src/QuColors.c
+++ b/libX11/src/QuColors.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuColors.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/QuCurShp.c b/libX11/src/QuCurShp.c
index a1c6d652c..266e9bec2 100644
--- a/libX11/src/QuCurShp.c
+++ b/libX11/src/QuCurShp.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuCurShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/QuExt.c b/libX11/src/QuExt.c
index e46725391..ca94f0486 100644
--- a/libX11/src/QuExt.c
+++ b/libX11/src/QuExt.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuExt.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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$ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/QuKeybd.c b/libX11/src/QuKeybd.c
index 22ba2fae4..a7446a2f2 100644
--- a/libX11/src/QuKeybd.c
+++ b/libX11/src/QuKeybd.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuKeybd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/QuPntr.c b/libX11/src/QuPntr.c
index b1ccc1c72..d2968dc89 100644
--- a/libX11/src/QuPntr.c
+++ b/libX11/src/QuPntr.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuPntr.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/QuStipShp.c b/libX11/src/QuStipShp.c
index 8724f8d77..5a8d310e9 100644
--- a/libX11/src/QuStipShp.c
+++ b/libX11/src/QuStipShp.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuStipShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/QuTextE16.c b/libX11/src/QuTextE16.c
index ee3817272..67facd1e1 100644
--- a/libX11/src/QuTextE16.c
+++ b/libX11/src/QuTextE16.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuTextE16.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:04 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/QuTextExt.c b/libX11/src/QuTextExt.c
index a144865c3..c94c11a82 100644
--- a/libX11/src/QuTextExt.c
+++ b/libX11/src/QuTextExt.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuTextExt.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:04 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/QuTileShp.c b/libX11/src/QuTileShp.c
index 4db554aca..55360e7d3 100644
--- a/libX11/src/QuTileShp.c
+++ b/libX11/src/QuTileShp.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuTileShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/QuTree.c b/libX11/src/QuTree.c
index fff6a6230..c40d08111 100644
--- a/libX11/src/QuTree.c
+++ b/libX11/src/QuTree.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuTree.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/01/17 19:41:42 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/Quarks.c b/libX11/src/Quarks.c
index 64c12f2c6..d0eb69018 100644
--- a/libX11/src/Quarks.c
+++ b/libX11/src/Quarks.c
@@ -1,4 +1,3 @@
-/* $Xorg: Quarks.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/***********************************************************
Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard,
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Quarks.c,v 1.6 2003/04/13 19:22:17 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/RaiseWin.c b/libX11/src/RaiseWin.c
index 585e9b17c..f431db579 100644
--- a/libX11/src/RaiseWin.c
+++ b/libX11/src/RaiseWin.c
@@ -1,4 +1,3 @@
-/* $Xorg: RaiseWin.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/RdBitF.c b/libX11/src/RdBitF.c
index c8a5705c1..07b47494b 100644
--- a/libX11/src/RdBitF.c
+++ b/libX11/src/RdBitF.c
@@ -1,4 +1,3 @@
-/* $Xorg: RdBitF.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/RecolorC.c b/libX11/src/RecolorC.c
index ad18e8a4d..a54b48cb8 100644
--- a/libX11/src/RecolorC.c
+++ b/libX11/src/RecolorC.c
@@ -1,4 +1,3 @@
-/* $Xorg: RecolorC.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ReconfWM.c b/libX11/src/ReconfWM.c
index 8c4ec160f..3f68c34fc 100644
--- a/libX11/src/ReconfWM.c
+++ b/libX11/src/ReconfWM.c
@@ -1,4 +1,3 @@
-/* $Xorg: ReconfWM.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/ReconfWin.c b/libX11/src/ReconfWin.c
index 9ca137f4d..bfa99f528 100644
--- a/libX11/src/ReconfWin.c
+++ b/libX11/src/ReconfWin.c
@@ -1,4 +1,3 @@
-/* $Xorg: ReconfWin.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Region.c b/libX11/src/Region.c
index 7d7e596a2..45a0bdac3 100644
--- a/libX11/src/Region.c
+++ b/libX11/src/Region.c
@@ -1,4 +1,3 @@
-/* $Xorg: Region.c,v 1.6 2001/02/09 02:03:35 xorgcvs Exp $ */
/************************************************************************
Copyright 1987, 1988, 1998 The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
************************************************************************/
-/* $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/libX11/src/RegstFlt.c b/libX11/src/RegstFlt.c
index f053e8232..9a560e794 100644
--- a/libX11/src/RegstFlt.c
+++ b/libX11/src/RegstFlt.c
@@ -1,4 +1,3 @@
-/* $Xorg: RegstFlt.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 by OMRON Corporation
@@ -52,7 +51,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/RepWindow.c b/libX11/src/RepWindow.c
index 274f790cf..1fde8d80f 100644
--- a/libX11/src/RepWindow.c
+++ b/libX11/src/RepWindow.c
@@ -1,4 +1,3 @@
-/* $Xorg: RepWindow.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/RestackWs.c b/libX11/src/RestackWs.c
index 95f8886f3..1dba3c89f 100644
--- a/libX11/src/RestackWs.c
+++ b/libX11/src/RestackWs.c
@@ -1,4 +1,3 @@
-/* $Xorg: RestackWs.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/RotProp.c b/libX11/src/RotProp.c
index 419a3e94b..98d7dbd81 100644
--- a/libX11/src/RotProp.c
+++ b/libX11/src/RotProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: RotProp.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/ScrResStr.c b/libX11/src/ScrResStr.c
index 8948e2469..0601c8644 100644
--- a/libX11/src/ScrResStr.c
+++ b/libX11/src/ScrResStr.c
@@ -1,4 +1,3 @@
-/* $Xorg: ScrResStr.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1991, 1998 The Open Group
diff --git a/libX11/src/SelInput.c b/libX11/src/SelInput.c
index e4bcad379..a3fa294f4 100644
--- a/libX11/src/SelInput.c
+++ b/libX11/src/SelInput.c
@@ -1,4 +1,3 @@
-/* $Xorg: SelInput.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SendEvent.c b/libX11/src/SendEvent.c
index bc35647b0..27e75caad 100644
--- a/libX11/src/SendEvent.c
+++ b/libX11/src/SendEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: SendEvent.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:05 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/SetBack.c b/libX11/src/SetBack.c
index 14f2b1593..269d10cc7 100644
--- a/libX11/src/SetBack.c
+++ b/libX11/src/SetBack.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetBack.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetCRects.c b/libX11/src/SetCRects.c
index 0231289e8..c7ad3fcf2 100644
--- a/libX11/src/SetCRects.c
+++ b/libX11/src/SetCRects.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetCRects.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:06 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetClMask.c b/libX11/src/SetClMask.c
index a715d03bc..82cdb2cce 100644
--- a/libX11/src/SetClMask.c
+++ b/libX11/src/SetClMask.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetClMask.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetClOrig.c b/libX11/src/SetClOrig.c
index f38f69ea0..800e1570d 100644
--- a/libX11/src/SetClOrig.c
+++ b/libX11/src/SetClOrig.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetClOrig.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetDashes.c b/libX11/src/SetDashes.c
index bba114978..ffe4a95ff 100644
--- a/libX11/src/SetDashes.c
+++ b/libX11/src/SetDashes.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetDashes.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:06 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetFPath.c b/libX11/src/SetFPath.c
index fe70ee2c6..89955c23e 100644
--- a/libX11/src/SetFPath.c
+++ b/libX11/src/SetFPath.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetFPath.c,v 1.5 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetFont.c b/libX11/src/SetFont.c
index 4827b89e8..33ffca02d 100644
--- a/libX11/src/SetFont.c
+++ b/libX11/src/SetFont.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetFont.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetFore.c b/libX11/src/SetFore.c
index e04b4fd60..50c9f1228 100644
--- a/libX11/src/SetFore.c
+++ b/libX11/src/SetFore.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetFore.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetFunc.c b/libX11/src/SetFunc.c
index f29c617ca..ffe4ec0cc 100644
--- a/libX11/src/SetFunc.c
+++ b/libX11/src/SetFunc.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetFunc.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetHints.c b/libX11/src/SetHints.c
index f9ce04d2e..0c33f5901 100644
--- a/libX11/src/SetHints.c
+++ b/libX11/src/SetHints.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetHints.c,v 1.5 2001/02/09 02:03:36 xorgcvs Exp $ */
/***********************************************************
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/SetHints.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetIFocus.c b/libX11/src/SetIFocus.c
index 6f10419fe..bee96ca82 100644
--- a/libX11/src/SetIFocus.c
+++ b/libX11/src/SetIFocus.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetIFocus.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetLStyle.c b/libX11/src/SetLStyle.c
index 93bc97a95..8b00fae9c 100644
--- a/libX11/src/SetLStyle.c
+++ b/libX11/src/SetLStyle.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetLStyle.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetLocale.c b/libX11/src/SetLocale.c
index a19baa927..00c76ee45 100644
--- a/libX11/src/SetLocale.c
+++ b/libX11/src/SetLocale.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */
-/* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
@@ -56,7 +54,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/SetLocale.c,v 3.20 2003/11/17 22:20:08 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetNrmHint.c b/libX11/src/SetNrmHint.c
index 043f3db01..94b447f26 100644
--- a/libX11/src/SetNrmHint.c
+++ b/libX11/src/SetNrmHint.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetNrmHint.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca,
diff --git a/libX11/src/SetPMask.c b/libX11/src/SetPMask.c
index 5f979c42f..9f236b00b 100644
--- a/libX11/src/SetPMask.c
+++ b/libX11/src/SetPMask.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetPMask.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetPntMap.c b/libX11/src/SetPntMap.c
index fe2361605..eaa642d65 100644
--- a/libX11/src/SetPntMap.c
+++ b/libX11/src/SetPntMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetPntMap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:06 dawes Exp $ */
#define NEED_REPLIES
diff --git a/libX11/src/SetRGBCMap.c b/libX11/src/SetRGBCMap.c
index f96a1955d..d2cbb5b5b 100644
--- a/libX11/src/SetRGBCMap.c
+++ b/libX11/src/SetRGBCMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetRGBCMap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/libX11/src/SetSOwner.c b/libX11/src/SetSOwner.c
index 5dfc1335f..bc8f56403 100644
--- a/libX11/src/SetSOwner.c
+++ b/libX11/src/SetSOwner.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetSOwner.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetSSaver.c b/libX11/src/SetSSaver.c
index 05c2a1b62..adce749e1 100644
--- a/libX11/src/SetSSaver.c
+++ b/libX11/src/SetSSaver.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetSSaver.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetStCmap.c b/libX11/src/SetStCmap.c
index c02dfcb17..8c3ae6e3b 100644
--- a/libX11/src/SetStCmap.c
+++ b/libX11/src/SetStCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetStCmap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/SetState.c b/libX11/src/SetState.c
index 0f0261159..e5aa21c05 100644
--- a/libX11/src/SetState.c
+++ b/libX11/src/SetState.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetState.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetStip.c b/libX11/src/SetStip.c
index dad429e9e..e95882786 100644
--- a/libX11/src/SetStip.c
+++ b/libX11/src/SetStip.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetStip.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetTSOrig.c b/libX11/src/SetTSOrig.c
index 56914a19e..0117c818b 100644
--- a/libX11/src/SetTSOrig.c
+++ b/libX11/src/SetTSOrig.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetTSOrig.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetTile.c b/libX11/src/SetTile.c
index 574ba9258..d32edff06 100644
--- a/libX11/src/SetTile.c
+++ b/libX11/src/SetTile.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetTile.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/SetTxtProp.c b/libX11/src/SetTxtProp.c
index 5d692f6d9..48689bcf1 100644
--- a/libX11/src/SetTxtProp.c
+++ b/libX11/src/SetTxtProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetTxtProp.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.
diff --git a/libX11/src/SetWMCMapW.c b/libX11/src/SetWMCMapW.c
index 4375531b2..a323912e7 100644
--- a/libX11/src/SetWMCMapW.c
+++ b/libX11/src/SetWMCMapW.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetWMCMapW.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/SetWMProto.c b/libX11/src/SetWMProto.c
index f1963c60f..700e13e8e 100644
--- a/libX11/src/SetWMProto.c
+++ b/libX11/src/SetWMProto.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetWMProto.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/StBytes.c b/libX11/src/StBytes.c
index f6a7788dd..13ac879c5 100644
--- a/libX11/src/StBytes.c
+++ b/libX11/src/StBytes.c
@@ -1,4 +1,3 @@
-/* $Xorg: StBytes.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:07 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/StColor.c b/libX11/src/StColor.c
index b35d83bb9..19f2a4b1a 100644
--- a/libX11/src/StColor.c
+++ b/libX11/src/StColor.c
@@ -1,4 +1,3 @@
-/* $Xorg: StColor.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/StColors.c b/libX11/src/StColors.c
index 904ff2363..17a215cc0 100644
--- a/libX11/src/StColors.c
+++ b/libX11/src/StColors.c
@@ -1,4 +1,3 @@
-/* $Xorg: StColors.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/StNColor.c b/libX11/src/StNColor.c
index 3e3c36912..8b821c3ef 100644
--- a/libX11/src/StNColor.c
+++ b/libX11/src/StNColor.c
@@ -1,4 +1,3 @@
-/* $Xorg: StNColor.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2003/04/13 19:22:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/StName.c b/libX11/src/StName.c
index b057cdae3..fb1e6f5e1 100644
--- a/libX11/src/StName.c
+++ b/libX11/src/StName.c
@@ -1,4 +1,3 @@
-/* $Xorg: StName.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:07 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/StrKeysym.c b/libX11/src/StrKeysym.c
index 1e06a8857..0758f9b02 100644
--- a/libX11/src/StrKeysym.c
+++ b/libX11/src/StrKeysym.c
@@ -1,4 +1,3 @@
-/* $Xorg: StrKeysym.c,v 1.5 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1990, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.7 2003/04/13 19:22:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/StrToText.c b/libX11/src/StrToText.c
index 3d35cf6b4..b5327e8fc 100644
--- a/libX11/src/StrToText.c
+++ b/libX11/src/StrToText.c
@@ -1,4 +1,3 @@
-/* $Xorg: StrToText.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
diff --git a/libX11/src/Sync.c b/libX11/src/Sync.c
index 3f2f4ce36..014cb1cf7 100644
--- a/libX11/src/Sync.c
+++ b/libX11/src/Sync.c
@@ -1,4 +1,3 @@
-/* $Xorg: Sync.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:44 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/libX11/src/Synchro.c b/libX11/src/Synchro.c
index 2688e79cc..930448ee9 100644
--- a/libX11/src/Synchro.c
+++ b/libX11/src/Synchro.c
@@ -1,4 +1,3 @@
-/* $Xorg: Synchro.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2003/04/13 19:22:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Text.c b/libX11/src/Text.c
index 8ddf4812d..223b1cf8b 100644
--- a/libX11/src/Text.c
+++ b/libX11/src/Text.c
@@ -1,4 +1,3 @@
-/* $Xorg: Text.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:07 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Text16.c b/libX11/src/Text16.c
index 0aa41a6a4..5a66a2bf6 100644
--- a/libX11/src/Text16.c
+++ b/libX11/src/Text16.c
@@ -1,4 +1,3 @@
-/* $Xorg: Text16.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/12/14 19:54:07 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/TextExt.c b/libX11/src/TextExt.c
index 62e84d681..b883b01b4 100644
--- a/libX11/src/TextExt.c
+++ b/libX11/src/TextExt.c
@@ -1,4 +1,3 @@
-/* $Xorg: TextExt.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/TextExt16.c b/libX11/src/TextExt16.c
index ee259e600..01a0f32e4 100644
--- a/libX11/src/TextExt16.c
+++ b/libX11/src/TextExt16.c
@@ -1,4 +1,3 @@
-/* $Xorg: TextExt16.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/TextToStr.c b/libX11/src/TextToStr.c
index 29d07c466..216391c2e 100644
--- a/libX11/src/TextToStr.c
+++ b/libX11/src/TextToStr.c
@@ -1,4 +1,3 @@
-/* $Xorg: TextToStr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/X11/TextToStr.c,v 1.4 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/TrCoords.c b/libX11/src/TrCoords.c
index 6ec0a0fa3..26d33b7a1 100644
--- a/libX11/src/TrCoords.c
+++ b/libX11/src/TrCoords.c
@@ -1,4 +1,3 @@
-/* $Xorg: TrCoords.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/UIThrStubs.c b/libX11/src/UIThrStubs.c
index 487bb06f1..a3bcdfc41 100644
--- a/libX11/src/UIThrStubs.c
+++ b/libX11/src/UIThrStubs.c
@@ -1,5 +1,4 @@
/*
- * $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/libX11/src/UndefCurs.c b/libX11/src/UndefCurs.c
index 7cfc07bbc..1d46ff946 100644
--- a/libX11/src/UndefCurs.c
+++ b/libX11/src/UndefCurs.c
@@ -1,4 +1,3 @@
-/* $Xorg: UndefCurs.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UngrabBut.c b/libX11/src/UngrabBut.c
index 8d0e2a8eb..13545ed98 100644
--- a/libX11/src/UngrabBut.c
+++ b/libX11/src/UngrabBut.c
@@ -1,4 +1,3 @@
-/* $Xorg: UngrabBut.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UngrabKbd.c b/libX11/src/UngrabKbd.c
index e0b2086ab..974e8a324 100644
--- a/libX11/src/UngrabKbd.c
+++ b/libX11/src/UngrabKbd.c
@@ -1,4 +1,3 @@
-/* $Xorg: UngrabKbd.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UngrabKey.c b/libX11/src/UngrabKey.c
index 70dc9f6c2..919c4e76c 100644
--- a/libX11/src/UngrabKey.c
+++ b/libX11/src/UngrabKey.c
@@ -1,4 +1,3 @@
-/* $Xorg: UngrabKey.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UngrabPtr.c b/libX11/src/UngrabPtr.c
index 8a3bbedda..16417921c 100644
--- a/libX11/src/UngrabPtr.c
+++ b/libX11/src/UngrabPtr.c
@@ -1,4 +1,3 @@
-/* $Xorg: UngrabPtr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UngrabSvr.c b/libX11/src/UngrabSvr.c
index 3c974f11b..ea0084879 100644
--- a/libX11/src/UngrabSvr.c
+++ b/libX11/src/UngrabSvr.c
@@ -1,4 +1,3 @@
-/* $Xorg: UngrabSvr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UninsCmap.c b/libX11/src/UninsCmap.c
index d8d16d92b..db574ef7c 100644
--- a/libX11/src/UninsCmap.c
+++ b/libX11/src/UninsCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: UninsCmap.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UnldFont.c b/libX11/src/UnldFont.c
index f01569731..a4f69fee4 100644
--- a/libX11/src/UnldFont.c
+++ b/libX11/src/UnldFont.c
@@ -1,4 +1,3 @@
-/* $Xorg: UnldFont.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/12/14 19:54:07 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UnmapSubs.c b/libX11/src/UnmapSubs.c
index 8df63d4bf..7490a70e9 100644
--- a/libX11/src/UnmapSubs.c
+++ b/libX11/src/UnmapSubs.c
@@ -1,4 +1,3 @@
-/* $Xorg: UnmapSubs.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/UnmapWin.c b/libX11/src/UnmapWin.c
index dca00351e..51ae16319 100644
--- a/libX11/src/UnmapWin.c
+++ b/libX11/src/UnmapWin.c
@@ -1,4 +1,3 @@
-/* $Xorg: UnmapWin.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/VisUtil.c b/libX11/src/VisUtil.c
index 6e957cb42..3434c0161 100644
--- a/libX11/src/VisUtil.c
+++ b/libX11/src/VisUtil.c
@@ -1,4 +1,3 @@
-/* $Xorg: VisUtil.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
diff --git a/libX11/src/WMGeom.c b/libX11/src/WMGeom.c
index 215ae7c40..7947536f5 100644
--- a/libX11/src/WMGeom.c
+++ b/libX11/src/WMGeom.c
@@ -1,4 +1,3 @@
-/* $Xorg: WMGeom.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2003/04/13 19:22:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/WMProps.c b/libX11/src/WMProps.c
index 26ffc3ba3..3ccb654fa 100644
--- a/libX11/src/WMProps.c
+++ b/libX11/src/WMProps.c
@@ -1,4 +1,3 @@
-/* $Xorg: WMProps.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1987, 1988, 1993, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/WarpPtr.c b/libX11/src/WarpPtr.c
index 223b035ee..c88ca4704 100644
--- a/libX11/src/WarpPtr.c
+++ b/libX11/src/WarpPtr.c
@@ -1,4 +1,3 @@
-/* $Xorg: WarpPtr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.3 2001/01/17 19:41:47 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/WinEvent.c b/libX11/src/WinEvent.c
index bcdf98148..511cc18c2 100644
--- a/libX11/src/WinEvent.c
+++ b/libX11/src/WinEvent.c
@@ -1,4 +1,3 @@
-/* $Xorg: WinEvent.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1985, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2001/10/28 03:32:32 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/Window.c b/libX11/src/Window.c
index 81996c546..85a28f372 100644
--- a/libX11/src/Window.c
+++ b/libX11/src/Window.c
@@ -1,4 +1,3 @@
-/* $Xorg: Window.c,v 1.5 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1986, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:08 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/Withdraw.c b/libX11/src/Withdraw.c
index fbfc013a8..9e284e49f 100644
--- a/libX11/src/Withdraw.c
+++ b/libX11/src/Withdraw.c
@@ -1,4 +1,3 @@
-/* $Xorg: Withdraw.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/***********************************************************
Copyright 1988 by Wyse Technology, Inc., San Jose, Ca.,
diff --git a/libX11/src/WrBitF.c b/libX11/src/WrBitF.c
index 01be0661d..1ec6280fb 100644
--- a/libX11/src/WrBitF.c
+++ b/libX11/src/WrBitF.c
@@ -1,4 +1,3 @@
-/* $Xorg: WrBitF.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/WrBitF.c,v 3.6 2003/04/13 19:22:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/XErrorDB b/libX11/src/XErrorDB
index 42a7cbc7c..25b79a026 100644
--- a/libX11/src/XErrorDB
+++ b/libX11/src/XErrorDB
@@ -1,5 +1,3 @@
-! $Xorg: XErrorDB,v 1.3 2000/08/17 19:44:59 cpqbld Exp $
-! $XdotOrg: lib/X11/src/XErrorDB,v 1.4 2005-10-21 18:44:24 ajax Exp $
!
! Copyright 1993, 1995, 1998 The Open Group
@@ -25,7 +23,6 @@
! other dealings in this Software without prior written authorization
! from The Open Group.
!
-! $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/libX11/src/XKeysymDB b/libX11/src/XKeysymDB
index 2dec6e2ac..45d892971 100644
--- a/libX11/src/XKeysymDB
+++ b/libX11/src/XKeysymDB
@@ -1,4 +1,3 @@
-! $Xorg: XKeysymDB,v 1.3 2000/08/17 19:45:04 cpqbld Exp $
! Copyright 1993 Massachusetts Institute of Technology
!
! Permission to use, copy, modify, distribute, and sell this software and
@@ -11,7 +10,6 @@
! suitability of this software for any purpose. It is provided "as is"
! without express or implied warranty.
!
-! $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/libX11/src/Xatomtype.h b/libX11/src/Xatomtype.h
index d9bb818fb..1b2b47766 100644
--- a/libX11/src/Xatomtype.h
+++ b/libX11/src/Xatomtype.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xatomtype.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
/***********************************************************
diff --git a/libX11/src/Xintatom.h b/libX11/src/Xintatom.h
index f1e13568b..82dba36e1 100644
--- a/libX11/src/Xintatom.h
+++ b/libX11/src/Xintatom.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
#ifndef _XINTATOM_H_
#define _XINTATOM_H_ 1
diff --git a/libX11/src/Xintconn.h b/libX11/src/Xintconn.h
index 82cf9db31..ee975ac44 100644
--- a/libX11/src/Xintconn.h
+++ b/libX11/src/Xintconn.h
@@ -1,4 +1,3 @@
-/* $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/libX11/src/XlibAsync.c b/libX11/src/XlibAsync.c
index 28f898b8f..b4483ef6b 100644
--- a/libX11/src/XlibAsync.c
+++ b/libX11/src/XlibAsync.c
@@ -1,4 +1,3 @@
-/* $Xorg: XlibAsync.c,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
/*
Copyright 1992, 1998 The Open Group
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index 445b8b010..5047e48a8 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/src/XlibInt.c
@@ -1,4 +1,3 @@
-/* $Xorg: XlibInt.c,v 1.8 2001/02/09 02:03:38 xorgcvs Exp $ */
/*
Copyright 1985, 1986, 1987, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/XomGeneric.h b/libX11/src/XomGeneric.h
index 8e245f894..d6f182d19 100644
--- a/libX11/src/XomGeneric.h
+++ b/libX11/src/XomGeneric.h
@@ -1,4 +1,3 @@
-/* $Xorg: XomGeneric.h,v 1.3 2000/08/17 19:45:08 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -31,7 +30,6 @@
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $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/libX11/src/Xresinternal.h b/libX11/src/Xresinternal.h
index fc752855b..b4b1b00f8 100644
--- a/libX11/src/Xresinternal.h
+++ b/libX11/src/Xresinternal.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
#ifndef _XRESINTERNAL_H_
#define _XRESINTERNAL_H_
diff --git a/libX11/src/Xrm.c b/libX11/src/Xrm.c
index 46bc31daa..21f0af3c0 100644
--- a/libX11/src/Xrm.c
+++ b/libX11/src/Xrm.c
@@ -1,4 +1,3 @@
-/* $Xorg: Xrm.c,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */
/***********************************************************
Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/Xrm.c,v 3.22 2003/07/16 01:38:26 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/XrmI.h b/libX11/src/XrmI.h
index 0791260df..7e2560783 100644
--- a/libX11/src/XrmI.h
+++ b/libX11/src/XrmI.h
@@ -1,4 +1,3 @@
-/* $Xorg: XrmI.h,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */
/*
Copyright 1990, 1998 The Open Group
diff --git a/libX11/src/config.h.in b/libX11/src/config.h.in
index dad2901a0..12ed0ac75 100644
--- a/libX11/src/config.h.in
+++ b/libX11/src/config.h.in
@@ -69,6 +69,9 @@
/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
@@ -108,6 +111,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/libX11/src/evtomask.c b/libX11/src/evtomask.c
index fbbb998d3..b108d2a88 100644
--- a/libX11/src/evtomask.c
+++ b/libX11/src/evtomask.c
@@ -1,4 +1,3 @@
-/* $Xorg: evtomask.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */
/*
Copyright 1987, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/07/29 05:01:11 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/globals.c b/libX11/src/globals.c
index 30ff11df7..415ee81f3 100644
--- a/libX11/src/globals.c
+++ b/libX11/src/globals.c
@@ -1,4 +1,3 @@
-/* $Xorg: globals.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */
/*
Copyright 1989, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/globals.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */
/*
*
diff --git a/libX11/src/imConv.c b/libX11/src/imConv.c
index 2a50c37cb..4068b59ba 100644
--- a/libX11/src/imConv.c
+++ b/libX11/src/imConv.c
@@ -1,4 +1,3 @@
-/* $TOG: imConv.c /main/20 1998/06/17 15:46:41 kaleb $ */
/******************************************************************
Copyright 1991, 1992 by Fuji Xerox Co.,Ltd.
@@ -33,7 +32,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
/* 2000 Modifier: Ivan Pascal The XFree86 Project.
*/
-/* $XFree86: xc/lib/X11/imConv.c,v 1.32 2003/04/13 19:22:20 dawes Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/locking.c b/libX11/src/locking.c
index 8c85badfd..3f93d0cd8 100644
--- a/libX11/src/locking.c
+++ b/libX11/src/locking.c
@@ -1,4 +1,3 @@
-/* $Xorg: locking.c,v 1.5 2001/02/09 02:03:40 xorgcvs Exp $ */
/*
Copyright 1992, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.5 2003/04/13 19:22:22 dawes Exp $ */
/*
* Author: Stephen Gildea, MIT X Consortium
diff --git a/libX11/src/locking.h b/libX11/src/locking.h
index ced618152..96019fc91 100644
--- a/libX11/src/locking.h
+++ b/libX11/src/locking.h
@@ -1,4 +1,3 @@
-/* $Xorg: locking.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */
/*
Copyright 1992, 1998 The Open Group
@@ -24,7 +23,6 @@ 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.4 2001/12/14 19:54:10 dawes Exp $ */
/*
* Author: Stephen Gildea, MIT X Consortium
diff --git a/libX11/src/os2Stubs.c b/libX11/src/os2Stubs.c
index 6d99cd750..ee09cb5fe 100644
--- a/libX11/src/os2Stubs.c
+++ b/libX11/src/os2Stubs.c
@@ -28,7 +28,6 @@
*
*/
-/* $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/libX11/src/poly.h b/libX11/src/poly.h
index 0215acd4b..e064783d7 100644
--- a/libX11/src/poly.h
+++ b/libX11/src/poly.h
@@ -1,4 +1,3 @@
-/* $Xorg: poly.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */
/************************************************************************
Copyright 1987, 1998 The Open Group
diff --git a/libX11/src/udcInf.c b/libX11/src/udcInf.c
index fafc642b9..db7ad10f3 100644
--- a/libX11/src/udcInf.c
+++ b/libX11/src/udcInf.c
@@ -1,4 +1,3 @@
-/* $Xorg: udcInf.c,v 1.7 2001/02/09 02:03:40 xorgcvs Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -33,7 +32,6 @@ from The Open Group.
*
*/
-/* $XFree86: xc/lib/X11/udcInf.c,v 1.6 2001/01/17 19:41:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/util/Makefile.am b/libX11/src/util/Makefile.am
index c9e81c044..7fc8da5c4 100644
--- a/libX11/src/util/Makefile.am
+++ b/libX11/src/util/Makefile.am
@@ -1,4 +1,3 @@
-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
noinst_PROGRAMS=makekeys
diff --git a/libX11/src/util/Makefile.in b/libX11/src/util/Makefile.in
index 88e217bf1..6fee791b5 100644
--- a/libX11/src/util/Makefile.in
+++ b/libX11/src/util/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,8 +15,6 @@
@SET_MAKE@
-# $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -133,6 +131,7 @@ GREP = @GREP@
GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -165,6 +164,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -190,16 +190,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKEYSYMDB = @XKEYSYMDB@
XLOCALEDATADIR = @XLOCALEDATADIR@
XLOCALEDIR = @XLOCALEDIR@
XLOCALELIBDIR = @XLOCALELIBDIR@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -224,7 +220,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/libX11/src/util/makekeys.c b/libX11/src/util/makekeys.c
index 9f8084448..7129e9416 100644
--- a/libX11/src/util/makekeys.c
+++ b/libX11/src/util/makekeys.c
@@ -1,5 +1,3 @@
-/* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 $ */
-/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.5 2005-07-03 07:00:56 daniels Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: $ */
/* Constructs hash tables for XStringToKeysym and XKeysymToString. */
diff --git a/libX11/src/xcms/AddDIC.c b/libX11/src/xcms/AddDIC.c
index 8ac9852fc..ecc6650ab 100644
--- a/libX11/src/xcms/AddDIC.c
+++ b/libX11/src/xcms/AddDIC.c
@@ -1,4 +1,3 @@
-/* $Xorg: AddDIC.c,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/AddSF.c b/libX11/src/xcms/AddSF.c
index f7b1dd2da..2e244e73b 100644
--- a/libX11/src/xcms/AddSF.c
+++ b/libX11/src/xcms/AddSF.c
@@ -1,4 +1,3 @@
-/* $Xorg: AddSF.c,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/CCC.c b/libX11/src/xcms/CCC.c
index ba52f29d2..090b1078c 100644
--- a/libX11/src/xcms/CCC.c
+++ b/libX11/src/xcms/CCC.c
@@ -1,4 +1,3 @@
-/* $Xorg: CCC.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/CCC.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */
/*
diff --git a/libX11/src/xcms/Cv.h b/libX11/src/xcms/Cv.h
index a887e9d2b..0b662811f 100644
--- a/libX11/src/xcms/Cv.h
+++ b/libX11/src/xcms/Cv.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/Cv.h,v 1.1 2003/04/13 19:22:15 dawes Exp $ */
#ifndef _CV_H_
#define _CV_H_
diff --git a/libX11/src/xcms/CvColW.c b/libX11/src/xcms/CvColW.c
index 50e95dea1..4aabded0d 100644
--- a/libX11/src/xcms/CvColW.c
+++ b/libX11/src/xcms/CvColW.c
@@ -1,4 +1,3 @@
-/* $Xorg: CvColW.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/CvColW.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/CvCols.c b/libX11/src/xcms/CvCols.c
index 3a60b836d..ed3582663 100644
--- a/libX11/src/xcms/CvCols.c
+++ b/libX11/src/xcms/CvCols.c
@@ -1,4 +1,3 @@
-/* $Xorg: CvCols.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/CvCols.c,v 1.4 2003/04/13 19:22:15 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVC.c b/libX11/src/xcms/HVC.c
index 60e5eb81b..80f1735cf 100644
--- a/libX11/src/xcms/HVC.c
+++ b/libX11/src/xcms/HVC.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */
-/* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -48,7 +46,6 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/HVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCGcC.c b/libX11/src/xcms/HVCGcC.c
index 142a127e0..6d52eac63 100644
--- a/libX11/src/xcms/HVCGcC.c
+++ b/libX11/src/xcms/HVCGcC.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCGcC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -43,7 +42,6 @@
* Source for XcmsTekHVCClipC() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCGcV.c b/libX11/src/xcms/HVCGcV.c
index 80ff84ad0..0752a0724 100644
--- a/libX11/src/xcms/HVCGcV.c
+++ b/libX11/src/xcms/HVCGcV.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCGcV.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -43,7 +42,6 @@
* Source for XcmsTekHVCClipV() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCGcVC.c b/libX11/src/xcms/HVCGcVC.c
index d7c5e40f2..7ace5f13f 100644
--- a/libX11/src/xcms/HVCGcVC.c
+++ b/libX11/src/xcms/HVCGcVC.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCGcVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -43,7 +42,6 @@
* Source for XcmsTekHVCClipVC() gamut
* compression function.
*/
-/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCMnV.c b/libX11/src/xcms/HVCMnV.c
index 719efcd4f..10a9f857a 100644
--- a/libX11/src/xcms/HVCMnV.c
+++ b/libX11/src/xcms/HVCMnV.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCMnV.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -43,7 +42,6 @@
* Source for XcmsTekHVCQueryMinV gamut boundary querying routine.
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCMxC.c b/libX11/src/xcms/HVCMxC.c
index 3389b8d29..074844ccc 100644
--- a/libX11/src/xcms/HVCMxC.c
+++ b/libX11/src/xcms/HVCMxC.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCMxC.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -44,7 +43,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCMxV.c b/libX11/src/xcms/HVCMxV.c
index c54b83095..d5ef94ec5 100644
--- a/libX11/src/xcms/HVCMxV.c
+++ b/libX11/src/xcms/HVCMxV.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCMxV.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -44,7 +43,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCMxVC.c b/libX11/src/xcms/HVCMxVC.c
index ae22b89d1..c7e087866 100644
--- a/libX11/src/xcms/HVCMxVC.c
+++ b/libX11/src/xcms/HVCMxVC.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCMxVC.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -44,7 +43,6 @@
* querying routine.
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCMxVs.c b/libX11/src/xcms/HVCMxVs.c
index 7368792b2..540e5c2f4 100644
--- a/libX11/src/xcms/HVCMxVs.c
+++ b/libX11/src/xcms/HVCMxVs.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCMxVs.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -43,7 +42,6 @@
* Source for the XcmsTekHVCQueryMaxVSamples() gamut boundary
* querying routine.
*/
-/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/HVCWpAj.c b/libX11/src/xcms/HVCWpAj.c
index c7469ddee..dcefe7535 100644
--- a/libX11/src/xcms/HVCWpAj.c
+++ b/libX11/src/xcms/HVCWpAj.c
@@ -1,4 +1,3 @@
-/* $Xorg: HVCWpAj.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -44,7 +43,6 @@
* adjustment of color specifications in the TekHVC color
* space.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/IdOfPr.c b/libX11/src/xcms/IdOfPr.c
index 37c7a6317..3a92e0a11 100644
--- a/libX11/src/xcms/IdOfPr.c
+++ b/libX11/src/xcms/IdOfPr.c
@@ -1,4 +1,3 @@
-/* $Xorg: IdOfPr.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LRGB.c b/libX11/src/xcms/LRGB.c
index 6ec2a1889..4e9f029e4 100644
--- a/libX11/src/xcms/LRGB.c
+++ b/libX11/src/xcms/LRGB.c
@@ -1,4 +1,3 @@
-/* $Xorg: LRGB.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -35,7 +34,6 @@
* 4. RGB intensity to CIE XYZ
*
*/
-/* $XFree86: xc/lib/X11/LRGB.c,v 3.6 2003/04/13 19:22:16 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/Lab.c b/libX11/src/xcms/Lab.c
index df19964df..02c8d3b7c 100644
--- a/libX11/src/xcms/Lab.c
+++ b/libX11/src/xcms/Lab.c
@@ -1,4 +1,3 @@
-/* $Xorg: Lab.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -36,7 +35,6 @@
*
* Note that the range for L* is 0 to 1.
*/
-/* $XFree86: xc/lib/X11/Lab.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xcms/LabGcC.c b/libX11/src/xcms/LabGcC.c
index 1f929eb86..a5ec9f457 100644
--- a/libX11/src/xcms/LabGcC.c
+++ b/libX11/src/xcms/LabGcC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabGcC.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -30,7 +29,6 @@
* Source for XcmsCIELabClipuv() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LabGcC.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabGcL.c b/libX11/src/xcms/LabGcL.c
index fc82e5e83..3038b18a8 100644
--- a/libX11/src/xcms/LabGcL.c
+++ b/libX11/src/xcms/LabGcL.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabGcL.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -30,7 +29,6 @@
* Source for XcmsCIELabClipL() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LabGcL.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabGcLC.c b/libX11/src/xcms/LabGcLC.c
index e9b5a50b3..494d34e57 100644
--- a/libX11/src/xcms/LabGcLC.c
+++ b/libX11/src/xcms/LabGcLC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabGcLC.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -30,7 +29,6 @@
* Source for XcmsCIELabClipLab() gamut
* compression function.
*/
-/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabMnL.c b/libX11/src/xcms/LabMnL.c
index 2c2b2be54..18ff04cd1 100644
--- a/libX11/src/xcms/LabMnL.c
+++ b/libX11/src/xcms/LabMnL.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabMnL.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -31,7 +30,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LabMnL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabMxC.c b/libX11/src/xcms/LabMxC.c
index be763d3e1..fcadd236a 100644
--- a/libX11/src/xcms/LabMxC.c
+++ b/libX11/src/xcms/LabMxC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabMxC.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LabMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabMxL.c b/libX11/src/xcms/LabMxL.c
index 6db122227..66ef48481 100644
--- a/libX11/src/xcms/LabMxL.c
+++ b/libX11/src/xcms/LabMxL.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabMxL.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -31,7 +30,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LabMxL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabMxLC.c b/libX11/src/xcms/LabMxLC.c
index 9efc86972..8cc089a22 100644
--- a/libX11/src/xcms/LabMxLC.c
+++ b/libX11/src/xcms/LabMxLC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabMxLC.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -38,7 +37,6 @@
* Fred W. Billmeyer & Max Saltzman, "Principles of Color
* Technology", John Wily & Sons, Inc, 1981.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LabWpAj.c b/libX11/src/xcms/LabWpAj.c
index 5959779e6..0559fdee3 100644
--- a/libX11/src/xcms/LabWpAj.c
+++ b/libX11/src/xcms/LabWpAj.c
@@ -1,4 +1,3 @@
-/* $Xorg: LabWpAj.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
* adjustment of color specifications in the CIE L*a*b* color
* space.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/Luv.c b/libX11/src/xcms/Luv.c
index 8dae87f4a..82bc2946a 100644
--- a/libX11/src/xcms/Luv.c
+++ b/libX11/src/xcms/Luv.c
@@ -1,4 +1,3 @@
-/* $Xorg: Luv.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -38,7 +37,6 @@
* Fred W. Billmeyer & Max Saltzman, "Principles of Color
* Technology", John Wily & Sons, Inc, 1981.
*/
-/* $XFree86: xc/lib/X11/Luv.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvGcC.c b/libX11/src/xcms/LuvGcC.c
index 868748bb3..cadf4a8b2 100644
--- a/libX11/src/xcms/LuvGcC.c
+++ b/libX11/src/xcms/LuvGcC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvGcC.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -30,7 +29,6 @@
* Source for XcmsCIELuvClipuv() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvGcL.c b/libX11/src/xcms/LuvGcL.c
index e6dd58462..f5b6d99e4 100644
--- a/libX11/src/xcms/LuvGcL.c
+++ b/libX11/src/xcms/LuvGcL.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvGcL.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -30,7 +29,6 @@
* Source for XcmsCIELuvClipL() gamut compression routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvGcLC.c b/libX11/src/xcms/LuvGcLC.c
index a52d9fa1d..a9f8cbaf1 100644
--- a/libX11/src/xcms/LuvGcLC.c
+++ b/libX11/src/xcms/LuvGcLC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvGcLC.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -30,7 +29,6 @@
* Source for XcmsCIELuvClipLuv() gamut
* compression function.
*/
-/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvMnL.c b/libX11/src/xcms/LuvMnL.c
index fa83e1fde..b873fa652 100644
--- a/libX11/src/xcms/LuvMnL.c
+++ b/libX11/src/xcms/LuvMnL.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvMnL.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -31,7 +30,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvMxC.c b/libX11/src/xcms/LuvMxC.c
index 34abf6d46..a67251477 100644
--- a/libX11/src/xcms/LuvMxC.c
+++ b/libX11/src/xcms/LuvMxC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvMxC.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvMxL.c b/libX11/src/xcms/LuvMxL.c
index da06684a4..d1d495b08 100644
--- a/libX11/src/xcms/LuvMxL.c
+++ b/libX11/src/xcms/LuvMxL.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvMxL.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -31,7 +30,6 @@
* querying routine.
*
*/
-/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvMxLC.c b/libX11/src/xcms/LuvMxLC.c
index d8634038f..60b954916 100644
--- a/libX11/src/xcms/LuvMxLC.c
+++ b/libX11/src/xcms/LuvMxLC.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvMxLC.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -38,7 +37,6 @@
* Fred W. Billmeyer & Max Saltzman, "Principles of Color
* Technology", John Wily & Sons, Inc, 1981.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/LuvWpAj.c b/libX11/src/xcms/LuvWpAj.c
index 7ce643e89..aa2a3f462 100644
--- a/libX11/src/xcms/LuvWpAj.c
+++ b/libX11/src/xcms/LuvWpAj.c
@@ -1,4 +1,3 @@
-/* $Xorg: LuvWpAj.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
* adjustment of color specifications in the CIE CIELuv.color
* space.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/Makefile.in b/libX11/src/xcms/Makefile.in
index 43b7954ad..65400532b 100644
--- a/libX11/src/xcms/Makefile.in
+++ b/libX11/src/xcms/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -162,6 +162,7 @@ GREP = @GREP@
GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -194,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -219,16 +221,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKEYSYMDB = @XKEYSYMDB@
XLOCALEDATADIR = @XLOCALEDATADIR@
XLOCALEDIR = @XLOCALEDIR@
XLOCALELIBDIR = @XLOCALELIBDIR@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -253,7 +251,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/libX11/src/xcms/OfCCC.c b/libX11/src/xcms/OfCCC.c
index 29d37e6ef..06fc3d7a1 100644
--- a/libX11/src/xcms/OfCCC.c
+++ b/libX11/src/xcms/OfCCC.c
@@ -1,4 +1,3 @@
-/* $Xorg: OfCCC.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
diff --git a/libX11/src/xcms/PrOfId.c b/libX11/src/xcms/PrOfId.c
index 72f75b3fe..831f17ab9 100644
--- a/libX11/src/xcms/PrOfId.c
+++ b/libX11/src/xcms/PrOfId.c
@@ -1,4 +1,3 @@
-/* $Xorg: PrOfId.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/QBlack.c b/libX11/src/xcms/QBlack.c
index c3d1f949f..d7a69d399 100644
--- a/libX11/src/xcms/QBlack.c
+++ b/libX11/src/xcms/QBlack.c
@@ -1,4 +1,3 @@
-/* $Xorg: QBlack.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
diff --git a/libX11/src/xcms/QBlue.c b/libX11/src/xcms/QBlue.c
index 6aac33041..4555344e6 100644
--- a/libX11/src/xcms/QBlue.c
+++ b/libX11/src/xcms/QBlue.c
@@ -1,4 +1,3 @@
-/* $Xorg: QBlue.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
diff --git a/libX11/src/xcms/QGreen.c b/libX11/src/xcms/QGreen.c
index 449704d5a..0c888358a 100644
--- a/libX11/src/xcms/QGreen.c
+++ b/libX11/src/xcms/QGreen.c
@@ -1,4 +1,3 @@
-/* $Xorg: QGreen.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
diff --git a/libX11/src/xcms/QRed.c b/libX11/src/xcms/QRed.c
index 5d119dbaa..357380d60 100644
--- a/libX11/src/xcms/QRed.c
+++ b/libX11/src/xcms/QRed.c
@@ -1,4 +1,3 @@
-/* $Xorg: QRed.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
diff --git a/libX11/src/xcms/QWhite.c b/libX11/src/xcms/QWhite.c
index 956bc8a89..36b764c9d 100644
--- a/libX11/src/xcms/QWhite.c
+++ b/libX11/src/xcms/QWhite.c
@@ -1,4 +1,3 @@
-/* $Xorg: QWhite.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
diff --git a/libX11/src/xcms/QuCol.c b/libX11/src/xcms/QuCol.c
index 673058712..b4c1cd33a 100644
--- a/libX11/src/xcms/QuCol.c
+++ b/libX11/src/xcms/QuCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuCol.c,v 1.3 2000/08/17 19:44:50 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/QuCol.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/QuCols.c b/libX11/src/xcms/QuCols.c
index b6f620528..25a38b818 100644
--- a/libX11/src/xcms/QuCols.c
+++ b/libX11/src/xcms/QuCols.c
@@ -1,4 +1,3 @@
-/* $Xorg: QuCols.c,v 1.3 2000/08/17 19:44:50 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/QuCols.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/SetCCC.c b/libX11/src/xcms/SetCCC.c
index 17d3de0b0..e8171b4ea 100644
--- a/libX11/src/xcms/SetCCC.c
+++ b/libX11/src/xcms/SetCCC.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetCCC.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/SetGetCols.c b/libX11/src/xcms/SetGetCols.c
index ce482553b..9b548dbb2 100644
--- a/libX11/src/xcms/SetGetCols.c
+++ b/libX11/src/xcms/SetGetCols.c
@@ -1,4 +1,3 @@
-/* $Xorg: SetGetCols.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86$ */
/*
* EXTERNAL INCLUDES
diff --git a/libX11/src/xcms/StCol.c b/libX11/src/xcms/StCol.c
index e93b0dd37..941ad0743 100644
--- a/libX11/src/xcms/StCol.c
+++ b/libX11/src/xcms/StCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: StCol.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/StCol.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/StCols.c b/libX11/src/xcms/StCols.c
index 65355f6d7..24ccd386f 100644
--- a/libX11/src/xcms/StCols.c
+++ b/libX11/src/xcms/StCols.c
@@ -1,4 +1,3 @@
-/* $Xorg: StCols.c,v 1.3 2000/08/17 19:44:56 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/StCols.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/UNDEFINED.c b/libX11/src/xcms/UNDEFINED.c
index 9c9094ed2..7b1bdb68c 100644
--- a/libX11/src/xcms/UNDEFINED.c
+++ b/libX11/src/xcms/UNDEFINED.c
@@ -1,4 +1,3 @@
-/* $Xorg: UNDEFINED.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/XRGB.c b/libX11/src/xcms/XRGB.c
index e2697d2ab..03f980e99 100644
--- a/libX11/src/xcms/XRGB.c
+++ b/libX11/src/xcms/XRGB.c
@@ -1,4 +1,3 @@
-/* $Xorg: XRGB.c,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/XRGB.c,v 3.3 2001/07/29 05:01:11 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/XYZ.c b/libX11/src/xcms/XYZ.c
index 2868c925a..40d6ed3bb 100644
--- a/libX11/src/xcms/XYZ.c
+++ b/libX11/src/xcms/XYZ.c
@@ -1,4 +1,3 @@
-/* $Xorg: XYZ.c,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/XYZ.c,v 1.3 2001/01/17 19:41:49 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/Xcms.txt b/libX11/src/xcms/Xcms.txt
index 290694162..1c5b1adec 100644
--- a/libX11/src/xcms/Xcms.txt
+++ b/libX11/src/xcms/Xcms.txt
@@ -25,7 +25,6 @@
* DESCRIPTION
* Sample Color Name Database
*
- * $XFree86$
*/
diff --git a/libX11/src/xcms/Xcmsint.h b/libX11/src/xcms/Xcmsint.h
index 7ec0d1b00..75d947184 100644
--- a/libX11/src/xcms/Xcmsint.h
+++ b/libX11/src/xcms/Xcmsint.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xcmsint.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -29,7 +28,6 @@
* (i.e., for API internal use only)
*
*/
-/* $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/libX11/src/xcms/cmsAllCol.c b/libX11/src/xcms/cmsAllCol.c
index 1b2bc76f5..aeea46461 100644
--- a/libX11/src/xcms/cmsAllCol.c
+++ b/libX11/src/xcms/cmsAllCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsAllCol.c,v 1.3 2000/08/17 19:45:08 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.3 2001/01/17 19:41:50 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/cmsAllNCol.c b/libX11/src/xcms/cmsAllNCol.c
index b17f7e4c6..105e8bd98 100644
--- a/libX11/src/xcms/cmsAllNCol.c
+++ b/libX11/src/xcms/cmsAllNCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsAllNCol.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xcms/cmsCmap.c b/libX11/src/xcms/cmsCmap.c
index 932743b2b..f93a25b1f 100644
--- a/libX11/src/xcms/cmsCmap.c
+++ b/libX11/src/xcms/cmsCmap.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsCmap.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -33,7 +32,6 @@
*
*
*/
-/* $XFree86$ */
#define NEED_EVENTS
#define NEED_REPLIES
diff --git a/libX11/src/xcms/cmsColNm.c b/libX11/src/xcms/cmsColNm.c
index 8aa495857..41643703e 100644
--- a/libX11/src/xcms/cmsColNm.c
+++ b/libX11/src/xcms/cmsColNm.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.4 2005-07-03 07:00:55 daniels Exp $ */
-/* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +30,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.11 2003/04/13 19:22:20 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/cmsGlobls.c b/libX11/src/xcms/cmsGlobls.c
index 3453bef1c..c9e82f242 100644
--- a/libX11/src/xcms/cmsGlobls.c
+++ b/libX11/src/xcms/cmsGlobls.c
@@ -1,4 +1,3 @@
-/*$Xorg: cmsGlobls.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.4 2001/01/17 19:41:51 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/cmsInt.c b/libX11/src/xcms/cmsInt.c
index cab123538..b48036522 100644
--- a/libX11/src/xcms/cmsInt.c
+++ b/libX11/src/xcms/cmsInt.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsInt.c,v 1.4 2000/08/17 19:45:09 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -34,7 +33,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsInt.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */
/* #define NEED_EVENTS */
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xcms/cmsLkCol.c b/libX11/src/xcms/cmsLkCol.c
index 5c15bce78..776fffd75 100644
--- a/libX11/src/xcms/cmsLkCol.c
+++ b/libX11/src/xcms/cmsLkCol.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsLkCol.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -32,7 +31,6 @@
*
*
*/
-/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.5 2003/04/13 19:22:20 dawes Exp $ */
#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xcms/cmsMath.c b/libX11/src/xcms/cmsMath.c
index fd48b9ffc..70b067587 100644
--- a/libX11/src/xcms/cmsMath.c
+++ b/libX11/src/xcms/cmsMath.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsMath.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */
/*
@@ -25,7 +24,6 @@ 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.4 2001/07/29 05:01:11 tsi Exp $ */
/*
* Stephen Gildea, MIT X Consortium, January 1991
diff --git a/libX11/src/xcms/cmsProp.c b/libX11/src/xcms/cmsProp.c
index 191d66366..856ae84b6 100644
--- a/libX11/src/xcms/cmsProp.c
+++ b/libX11/src/xcms/cmsProp.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsProp.c,v 1.3 2000/08/17 19:45:10 cpqbld Exp $ */
/*
*
@@ -31,7 +30,6 @@
* This utility routines for manipulating properties.
*
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/cmsTrig.c b/libX11/src/xcms/cmsTrig.c
index 0ab4426fc..5a01a56c8 100644
--- a/libX11/src/xcms/cmsTrig.c
+++ b/libX11/src/xcms/cmsTrig.c
@@ -1,4 +1,3 @@
-/* $Xorg: cmsTrig.c,v 1.3 2000/08/17 19:45:10 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -24,7 +23,6 @@
* CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE.
*/
-/* $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/libX11/src/xcms/uvY.c b/libX11/src/xcms/uvY.c
index 0567b2063..5344fb17c 100644
--- a/libX11/src/xcms/uvY.c
+++ b/libX11/src/xcms/uvY.c
@@ -1,4 +1,3 @@
-/* $Xorg: uvY.c,v 1.3 2000/08/17 19:45:23 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -35,7 +34,6 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/uvY.c,v 1.3 2001/01/17 19:41:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xcms/xyY.c b/libX11/src/xcms/xyY.c
index 555afe4fe..6f9457496 100644
--- a/libX11/src/xcms/xyY.c
+++ b/libX11/src/xcms/xyY.c
@@ -1,4 +1,3 @@
-/* $Xorg: xyY.c,v 1.3 2000/08/17 19:45:23 cpqbld Exp $ */
/*
* Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc.
@@ -34,7 +33,6 @@
* DOCUMENTATION
* "TekColor Color Management System, System Implementor's Manual"
*/
-/* $XFree86: xc/lib/X11/xyY.c,v 1.3 2001/01/17 19:41:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/Makefile.in b/libX11/src/xkb/Makefile.in
index 70523a74d..0bfbce3fd 100644
--- a/libX11/src/xkb/Makefile.in
+++ b/libX11/src/xkb/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -131,6 +131,7 @@ GREP = @GREP@
GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -163,6 +164,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -188,16 +190,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKEYSYMDB = @XKEYSYMDB@
XLOCALEDATADIR = @XLOCALEDATADIR@
XLOCALEDIR = @XLOCALEDIR@
XLOCALELIBDIR = @XLOCALELIBDIR@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -222,7 +220,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/libX11/src/xkb/XKB.c b/libX11/src/xkb/XKB.c
index bdb317993..b9338e0d1 100644
--- a/libX11/src/xkb/XKB.c
+++ b/libX11/src/xkb/XKB.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKB.c,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.9 2003/04/17 02:06:31 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBAlloc.c b/libX11/src/xkb/XKBAlloc.c
index 567235ddc..bd615eaae 100644
--- a/libX11/src/xkb/XKBAlloc.c
+++ b/libX11/src/xkb/XKBAlloc.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBAlloc.c,v 1.4 2000/08/17 19:44:59 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/libX11/src/xkb/XKBBell.c b/libX11/src/xkb/XKBBell.c
index d2fed0a97..0054a5c28 100644
--- a/libX11/src/xkb/XKBBell.c
+++ b/libX11/src/xkb/XKBBell.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBBell.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBBind.c b/libX11/src/xkb/XKBBind.c
index 46f639051..c07c40697 100644
--- a/libX11/src/xkb/XKBBind.c
+++ b/libX11/src/xkb/XKBBind.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBBind.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */
/*
Copyright 1985, 1987, 1994, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/xkb/XKBCompat.c b/libX11/src/xkb/XKBCompat.c
index d52fd131b..ba7f6864f 100644
--- a/libX11/src/xkb/XKBCompat.c
+++ b/libX11/src/xkb/XKBCompat.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBCompat.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBCtrls.c b/libX11/src/xkb/XKBCtrls.c
index aadcccd3d..3742c94eb 100644
--- a/libX11/src/xkb/XKBCtrls.c
+++ b/libX11/src/xkb/XKBCtrls.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBCtrls.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.4 2002/12/10 04:33:48 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBCvt.c b/libX11/src/xkb/XKBCvt.c
index 2f7f1a142..b2621a9b1 100644
--- a/libX11/src/xkb/XKBCvt.c
+++ b/libX11/src/xkb/XKBCvt.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBCvt.c,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */
/*
Copyright 1988, 1989, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.34 2002/10/08 23:31:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBExtDev.c b/libX11/src/xkb/XKBExtDev.c
index 011f3bc33..e8157b95b 100644
--- a/libX11/src/xkb/XKBExtDev.c
+++ b/libX11/src/xkb/XKBExtDev.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBExtDev.c,v 1.3 2000/08/17 19:45:01 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.4 2001/10/28 03:32:33 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBGAlloc.c b/libX11/src/xkb/XKBGAlloc.c
index b3c3e342c..8f163c340 100644
--- a/libX11/src/xkb/XKBGAlloc.c
+++ b/libX11/src/xkb/XKBGAlloc.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBGAlloc.c,v 1.3 2000/08/17 19:45:01 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/libX11/src/xkb/XKBGeom.c b/libX11/src/xkb/XKBGeom.c
index c88d5016e..0ff744952 100644
--- a/libX11/src/xkb/XKBGeom.c
+++ b/libX11/src/xkb/XKBGeom.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBGeom.c,v 1.4 2000/08/17 19:45:01 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.5 2003/04/13 19:22:18 dawes Exp $ */
#ifdef DEBUG
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xkb/XKBGetByName.c b/libX11/src/xkb/XKBGetByName.c
index c44bd4bbf..15d0338a5 100644
--- a/libX11/src/xkb/XKBGetByName.c
+++ b/libX11/src/xkb/XKBGetByName.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBGetByName.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/libX11/src/xkb/XKBGetMap.c b/libX11/src/xkb/XKBGetMap.c
index b692dfbdf..53ebb2c15 100644
--- a/libX11/src/xkb/XKBGetMap.c
+++ b/libX11/src/xkb/XKBGetMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBGetMap.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -25,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $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/libX11/src/xkb/XKBList.c b/libX11/src/xkb/XKBList.c
index f348f1c70..f202d935d 100644
--- a/libX11/src/xkb/XKBList.c
+++ b/libX11/src/xkb/XKBList.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBList.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/libX11/src/xkb/XKBMAlloc.c b/libX11/src/xkb/XKBMAlloc.c
index b1ba3ed20..3ed9c7bf2 100644
--- a/libX11/src/xkb/XKBMAlloc.c
+++ b/libX11/src/xkb/XKBMAlloc.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBMAlloc.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/libX11/src/xkb/XKBMisc.c b/libX11/src/xkb/XKBMisc.c
index c7db46587..33bc2ccb7 100644
--- a/libX11/src/xkb/XKBMisc.c
+++ b/libX11/src/xkb/XKBMisc.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBMisc.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/libX11/src/xkb/XKBNames.c b/libX11/src/xkb/XKBNames.c
index aad72c15a..b07f73ca5 100644
--- a/libX11/src/xkb/XKBNames.c
+++ b/libX11/src/xkb/XKBNames.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBNames.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.5 2003/04/13 19:22:18 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/libX11/src/xkb/XKBRdBuf.c b/libX11/src/xkb/XKBRdBuf.c
index 7fe845298..6d1f6724b 100644
--- a/libX11/src/xkb/XKBRdBuf.c
+++ b/libX11/src/xkb/XKBRdBuf.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBRdBuf.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.2 2001/10/28 03:32:33 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBSetGeom.c b/libX11/src/xkb/XKBSetGeom.c
index e11fa934f..4c632fdcf 100644
--- a/libX11/src/xkb/XKBSetGeom.c
+++ b/libX11/src/xkb/XKBSetGeom.c
@@ -1,5 +1,3 @@
-/* $Xorg: XKBSetGeom.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */
-/* $XdotOrg: lib/X11/src/xkb/XKBSetGeom.c,v 1.5 2005-07-03 07:00:55 daniels Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -25,7 +23,6 @@ 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.5 2003/05/27 22:26:25 tsi Exp $ */
#ifdef DEBUG
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xkb/XKBSetMap.c b/libX11/src/xkb/XKBSetMap.c
index d513c49ce..bd46e1fc7 100644
--- a/libX11/src/xkb/XKBSetMap.c
+++ b/libX11/src/xkb/XKBSetMap.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBSetMap.c,v 1.4 2000/08/17 19:45:03 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.2 2001/01/17 19:41:49 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBUse.c b/libX11/src/xkb/XKBUse.c
index a9db88d16..4b6c1daa8 100644
--- a/libX11/src/xkb/XKBUse.c
+++ b/libX11/src/xkb/XKBUse.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBUse.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.7 2003/07/07 15:34:21 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xkb/XKBleds.c b/libX11/src/xkb/XKBleds.c
index e0cc14b44..24a42c337 100644
--- a/libX11/src/xkb/XKBleds.c
+++ b/libX11/src/xkb/XKBleds.c
@@ -1,4 +1,3 @@
-/* $Xorg: XKBleds.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.4 2003/04/13 19:22:18 dawes Exp $ */
#define NEED_REPLIES
#define NEED_EVENTS
diff --git a/libX11/src/xkb/XKBlibint.h b/libX11/src/xkb/XKBlibint.h
index 158288ecd..ce145276c 100644
--- a/libX11/src/xkb/XKBlibint.h
+++ b/libX11/src/xkb/XKBlibint.h
@@ -1,4 +1,3 @@
-/* $Xorg: XKBlibint.h,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@ 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.5 2003/04/18 18:21:45 torrey Exp $ */
#ifndef _XKBLIBINT_H_
#define _XKBLIBINT_H_
diff --git a/libX11/src/xlibi18n/ICWrap.c b/libX11/src/xlibi18n/ICWrap.c
index 3708229b9..018f89a6b 100644
--- a/libX11/src/xlibi18n/ICWrap.c
+++ b/libX11/src/xlibi18n/ICWrap.c
@@ -1,8 +1,4 @@
/*
- * $Xorg: ICWrap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $
- */
-
-/*
* Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation,
* and Nippon Telegraph and Telephone Corporation
* Copyright 1991 by the Open Software Foundation
@@ -64,7 +60,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/ICWrap.c,v 1.10 2003/04/25 14:12:38 tsi Exp $ */
#define NEED_EVENTS
#ifdef HAVE_CONFIG_H
diff --git a/libX11/src/xlibi18n/IMWrap.c b/libX11/src/xlibi18n/IMWrap.c
index 1e5b8f0b4..0f6ed5593 100644
--- a/libX11/src/xlibi18n/IMWrap.c
+++ b/libX11/src/xlibi18n/IMWrap.c
@@ -1,8 +1,4 @@
/*
- * $Xorg: IMWrap.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $
- */
-
-/*
* Copyright 1991 by the Open Software Foundation
* Copyright 1993, 1994 by the Sony Corporation
*
@@ -57,7 +53,6 @@ from The Open Group.
*/
-/* $XFree86: xc/lib/X11/IMWrap.c,v 3.8 2001/12/14 19:54:01 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/Makefile.in b/libX11/src/xlibi18n/Makefile.in
index 380a00b3a..c54895af1 100644
--- a/libX11/src/xlibi18n/Makefile.in
+++ b/libX11/src/xlibi18n/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -159,6 +159,7 @@ GREP = @GREP@
GROFF = @GROFF@
I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -191,6 +192,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -216,16 +218,12 @@ X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XERRORDB = @XERRORDB@
-XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
-XKBPROTO_LIBS = @XKBPROTO_LIBS@
XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
XKEYSYMDB = @XKEYSYMDB@
XLOCALEDATADIR = @XLOCALEDATADIR@
XLOCALEDIR = @XLOCALEDIR@
XLOCALELIBDIR = @XLOCALELIBDIR@
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XPROTO_CFLAGS = @XPROTO_CFLAGS@
-XPROTO_LIBS = @XPROTO_LIBS@
XTHREADLIB = @XTHREADLIB@
XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -250,7 +248,6 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
diff --git a/libX11/src/xlibi18n/XDefaultIMIF.c b/libX11/src/xlibi18n/XDefaultIMIF.c
index a8677f78a..de17d20c6 100644
--- a/libX11/src/xlibi18n/XDefaultIMIF.c
+++ b/libX11/src/xlibi18n/XDefaultIMIF.c
@@ -1,8 +1,6 @@
/*
Copyright 1985, 1986, 1987, 1991, 1998 The Open Group
-Portions Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -14,21 +12,18 @@ permission notice shall be included in all copies or substantial
portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP OR SUN MICROSYSTEMS, INC. BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE EVEN IF
-ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
-Except as contained in this notice, the names of The Open Group and/or
-Sun Microsystems, Inc. shall not be used in advertising or otherwise to
-promote the sale, use or other dealings in this Software without prior
-written authorization from The Open Group and/or Sun Microsystems,
-Inc., as applicable.
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
X Window System is a trademark of The Open Group
@@ -41,7 +36,29 @@ 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.3 2003/04/13 19:22:18 dawes Exp $ */
+/*
+ * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/XDefaultOMIF.c b/libX11/src/xlibi18n/XDefaultOMIF.c
index d6c237eae..7815019b0 100644
--- a/libX11/src/xlibi18n/XDefaultOMIF.c
+++ b/libX11/src/xlibi18n/XDefaultOMIF.c
@@ -1,8 +1,6 @@
/*
Copyright 1985, 1986, 1987, 1991, 1998 The Open Group
-Portions Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -14,21 +12,18 @@ permission notice shall be included in all copies or substantial
portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP OR SUN MICROSYSTEMS, INC. BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE EVEN IF
-ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
-Except as contained in this notice, the names of The Open Group and/or
-Sun Microsystems, Inc. shall not be used in advertising or otherwise to
-promote the sale, use or other dealings in this Software without prior
-written authorization from The Open Group and/or Sun Microsystems,
-Inc., as applicable.
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
X Window System is a trademark of The Open Group
@@ -41,7 +36,29 @@ 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.5 2003/04/17 02:39:56 dawes Exp $ */
+/*
+ * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/Xaixlcint.h b/libX11/src/xlibi18n/Xaixlcint.h
index b7d344e96..446ba2581 100644
--- a/libX11/src/xlibi18n/Xaixlcint.h
+++ b/libX11/src/xlibi18n/Xaixlcint.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xaixlcint.h,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */
/*
*
* Copyright IBM Corporation 1993
diff --git a/libX11/src/xlibi18n/XimImSw.h b/libX11/src/xlibi18n/XimImSw.h
index d13d43c24..e3a962552 100644
--- a/libX11/src/xlibi18n/XimImSw.h
+++ b/libX11/src/xlibi18n/XimImSw.h
@@ -1,4 +1,3 @@
-/* $Xorg: XimImSw.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
/******************************************************************
Copyright 1992, 1993 by FUJITSU LIMITED
@@ -26,7 +25,6 @@ PERFORMANCE OF THIS SOFTWARE.
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86$ */
#ifndef _XIMIMSW_H
#define _XIMIMSW_H
diff --git a/libX11/src/xlibi18n/XimProto.h b/libX11/src/xlibi18n/XimProto.h
index c7458b089..6b0096dd6 100644
--- a/libX11/src/xlibi18n/XimProto.h
+++ b/libX11/src/xlibi18n/XimProto.h
@@ -1,4 +1,3 @@
-/* $Xorg: XimProto.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
/******************************************************************
Copyright 1992, 1993 by FUJITSU LIMITED
diff --git a/libX11/src/xlibi18n/XimThai.h b/libX11/src/xlibi18n/XimThai.h
index 28e909568..e4c476cf6 100644
--- a/libX11/src/xlibi18n/XimThai.h
+++ b/libX11/src/xlibi18n/XimThai.h
@@ -1,4 +1,3 @@
-/* $Xorg: XimThai.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
/***********************************************************
Copyright 1993, 1998 The Open Group
@@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/X11/XimThai.h,v 1.5 2001/12/14 19:54:08 dawes Exp $ */
/*
**++
diff --git a/libX11/src/xlibi18n/XimTrInt.h b/libX11/src/xlibi18n/XimTrInt.h
index cab201dfd..b7e4439d2 100644
--- a/libX11/src/xlibi18n/XimTrInt.h
+++ b/libX11/src/xlibi18n/XimTrInt.h
@@ -1,34 +1,53 @@
-/* $Xorg: XimTrInt.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
+/*
+ * Copyright 1992 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
/******************************************************************
- Copyright 1992 by Sun Microsystems, Inc.
Copyright 1993, 1994 by FUJITSU LIMITED
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
provided that the above copyright notice appear in all copies and
that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
+in supporting documentation, and that the name of FUJITSU LIMITED
not be used in advertising or publicity pertaining to distribution
of the software without specific, written prior permission.
-Sun Microsystems, Inc. makes no representations about the suitability of
-this software for any purpose. It is provided "as is" without
-express or implied warranty.
+FUJITSU LIMITED makes no representations about the suitability of
+this software for any purpose.
+It is provided "as is" without express or implied warranty.
-Sun Microsystems Inc. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL Sun Microsystems, Inc. BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
+FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
Takashi Fujiwara FUJITSU LIMITED
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86$ */
#ifndef _XIMTRINT_H
#define _XIMTRINT_H
diff --git a/libX11/src/xlibi18n/XimTrX.h b/libX11/src/xlibi18n/XimTrX.h
index edf8a8a86..1c24fe368 100644
--- a/libX11/src/xlibi18n/XimTrX.h
+++ b/libX11/src/xlibi18n/XimTrX.h
@@ -1,34 +1,53 @@
-/* $Xorg: XimTrX.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
+/*
+ * Copyright 1992 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
/******************************************************************
- Copyright 1992 by Sun Microsystems, Inc.
Copyright 1992, 1993, 1994 by FUJITSU LIMITED
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
provided that the above copyright notice appear in all copies and
that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
+in supporting documentation, and that the name of FUJITSU LIMITED
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+FUJITSU LIMITED makes no representations about the suitability of
+this software for any purpose.
It is provided "as is" without express or implied warranty.
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
Takashi Fujiwara FUJITSU LIMITED
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $XFree86$ */
#ifndef _XIMTRX_H
#define _XIMTRX_H
diff --git a/libX11/src/xlibi18n/XimTrans.h b/libX11/src/xlibi18n/XimTrans.h
index 3123879d5..987b5ee33 100644
--- a/libX11/src/xlibi18n/XimTrans.h
+++ b/libX11/src/xlibi18n/XimTrans.h
@@ -1,34 +1,53 @@
-/* $Xorg: XimTrans.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
+/*
+ * Copyright 1992 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
/******************************************************************
- Copyright 1992 by Sun Microsystems, Inc.
Copyright 1992, 1993, 1994 by FUJITSU LIMITED
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
provided that the above copyright notice appear in all copies and
that both that copyright notice and this permission notice appear
-in supporting documentation, and that the name of Sun Microsystems, Inc.
-and FUJITSU LIMITED not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-Sun Microsystems, Inc. and FUJITSU LIMITED makes no representations about
-the suitability of this software for any purpose.
+in supporting documentation, and that the name of FUJITSU LIMITED
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+FUJITSU LIMITED makes no representations about the suitability of
+this software for any purpose.
It is provided "as is" without express or implied warranty.
-Sun Microsystems Inc. AND FUJITSU LIMITED DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc. AND FUJITSU LIMITED
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL FUJITSU LIMITED BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
Takashi Fujiwara FUJITSU LIMITED
fujiwara@a80.tech.yk.fujitsu.co.jp
******************************************************************/
-/* $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/libX11/src/xlibi18n/Ximint.h b/libX11/src/xlibi18n/Ximint.h
index 1b1ad3377..2fd3017af 100644
--- a/libX11/src/xlibi18n/Ximint.h
+++ b/libX11/src/xlibi18n/Ximint.h
@@ -1,4 +1,3 @@
-/* $Xorg: Ximint.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
/******************************************************************
Copyright 1992, 1993, 1994 by FUJITSU LIMITED
@@ -30,7 +29,6 @@ PERFORMANCE OF THIS SOFTWARE.
makoto@sm.sony.co.jp
******************************************************************/
-/* $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/libX11/src/xlibi18n/XimintL.h b/libX11/src/xlibi18n/XimintL.h
index 1ac4d478f..d2d92387f 100644
--- a/libX11/src/xlibi18n/XimintL.h
+++ b/libX11/src/xlibi18n/XimintL.h
@@ -1,4 +1,3 @@
-/* $Xorg: XimintL.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
/******************************************************************
Copyright 1991, 1992, 1993, 1994 by FUJITSU LIMITED
@@ -32,7 +31,6 @@ THIS SOFTWARE.
frankyling@hgrd01.enet.dec.com
******************************************************************/
-/* $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/libX11/src/xlibi18n/XimintP.h b/libX11/src/xlibi18n/XimintP.h
index bb99313d2..89b7c214f 100644
--- a/libX11/src/xlibi18n/XimintP.h
+++ b/libX11/src/xlibi18n/XimintP.h
@@ -1,7 +1,27 @@
-/* $Xorg: XimintP.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */
+/*
+ * Copyright 1991, 1992 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
/******************************************************************
- Copyright 1991, 1992 by Sun Microsystems, Inc.
Copyright 1992, 1993, 1994 by FUJITSU LIMITED
Copyright 1993, 1994 by Sony Corporation
@@ -9,22 +29,20 @@ Permission to use, copy, modify, distribute, and sell this software and
its documentation for any purpose is hereby granted without fee, provided
that the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
-documentation, and that the name of Sun Microsystems, Inc., FUJITSU
-LIMITED and Sony Corporation not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission. Sun Microsystems, Inc., FUJITSU LIMITED and Sony
-Corporation makes no representations about the suitability of this
+documentation, and that the name of FUJITSU LIMITED and Sony Corporation
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission. FUJITSU LIMITED and
+Sony Corporation makes no representations about the suitability of this
software for any purpose. It is provided "as is" without express or
implied warranty.
-Sun Microsystems Inc. ,FUJITSU LIMITED AND SONY CORPORATION DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Sun Microsystems, Inc.,
-FUJITSU LIMITED, SONY CORPORATIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+FUJITSU LIMITED AND SONY CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL FUJITSU LIMITED OR SONY CORPORATION BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
+USE OR PERFORMANCE OF THIS SOFTWARE.
Author: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
Takashi Fujiwara FUJITSU LIMITED
@@ -35,7 +53,6 @@ PERFORMANCE OF THIS SOFTWARE.
miyamoto@jrd.dec.com
******************************************************************/
-/* $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/libX11/src/xlibi18n/XlcDL.c b/libX11/src/xlibi18n/XlcDL.c
index 30dee0c41..879bc51eb 100644
--- a/libX11/src/xlibi18n/XlcDL.c
+++ b/libX11/src/xlibi18n/XlcDL.c
@@ -1,8 +1,6 @@
/*
Copyright 1985, 1986, 1987, 1991, 1998 The Open Group
-Portions Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -14,21 +12,18 @@ permission notice shall be included in all copies or substantial
portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP OR SUN MICROSYSTEMS, INC. BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE EVEN IF
-ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
-Except as contained in this notice, the names of The Open Group and/or
-Sun Microsystems, Inc. shall not be used in advertising or otherwise to
-promote the sale, use or other dealings in this Software without prior
-written authorization from The Open Group and/or Sun Microsystems,
-Inc., as applicable.
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
X Window System is a trademark of The Open Group
@@ -41,8 +36,29 @@ 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.12 2003/04/13 19:22:19 dawes Exp $ */
-/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.6 2005-07-11 15:24:32 lars Exp $ */
+/*
+ * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/libX11/src/xlibi18n/XlcGeneric.h b/libX11/src/xlibi18n/XlcGeneric.h
index 1b9c68b1f..0c008fdaa 100644
--- a/libX11/src/xlibi18n/XlcGeneric.h
+++ b/libX11/src/xlibi18n/XlcGeneric.h
@@ -1,4 +1,3 @@
-/* $Xorg: XlcGeneric.h,v 1.3 2000/08/17 19:45:06 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -31,7 +30,6 @@
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $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/libX11/src/xlibi18n/XlcPubI.h b/libX11/src/xlibi18n/XlcPubI.h
index 51219305e..22ac2bdf0 100644
--- a/libX11/src/xlibi18n/XlcPubI.h
+++ b/libX11/src/xlibi18n/XlcPubI.h
@@ -1,4 +1,3 @@
-/* $Xorg: XlcPubI.h,v 1.4 2000/12/12 12:44:05 coskrey Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $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/libX11/src/xlibi18n/XlcPublic.h b/libX11/src/xlibi18n/XlcPublic.h
index 27595d8a2..3d94ef37d 100644
--- a/libX11/src/xlibi18n/XlcPublic.h
+++ b/libX11/src/xlibi18n/XlcPublic.h
@@ -1,4 +1,3 @@
-/* $Xorg: XlcPublic.h,v 1.3 2000/08/17 19:45:06 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -31,7 +30,6 @@
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $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/libX11/src/xlibi18n/XlcSL.c b/libX11/src/xlibi18n/XlcSL.c
index 9e6b67f31..526f677fb 100644
--- a/libX11/src/xlibi18n/XlcSL.c
+++ b/libX11/src/xlibi18n/XlcSL.c
@@ -1,8 +1,6 @@
/*
Copyright 1985, 1986, 1987, 1991, 1998 The Open Group
-Portions Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -14,21 +12,18 @@ permission notice shall be included in all copies or substantial
portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP OR SUN MICROSYSTEMS, INC. BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE EVEN IF
-ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
-Except as contained in this notice, the names of The Open Group and/or
-Sun Microsystems, Inc. shall not be used in advertising or otherwise to
-promote the sale, use or other dealings in this Software without prior
-written authorization from The Open Group and/or Sun Microsystems,
-Inc., as applicable.
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
X Window System is a trademark of The Open Group
@@ -41,7 +36,29 @@ interest in or to any trademark, service mark, logo or trade name of
Sun Microsystems, Inc. or its licensors is granted.
*/
-/* $XFree86$ */
+/*
+ * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/Xlcint.h b/libX11/src/xlibi18n/Xlcint.h
index a8c991bab..95d1f5d5c 100644
--- a/libX11/src/xlibi18n/Xlcint.h
+++ b/libX11/src/xlibi18n/Xlcint.h
@@ -1,4 +1,3 @@
-/* $Xorg: Xlcint.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
/*
Copyright 1991, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $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/libX11/src/xlibi18n/imKStoUCS.c b/libX11/src/xlibi18n/imKStoUCS.c
index 940d3ed2e..5cfce420d 100644
--- a/libX11/src/xlibi18n/imKStoUCS.c
+++ b/libX11/src/xlibi18n/imKStoUCS.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.4 2003/04/29 11:29:18 pascal Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcCT.c b/libX11/src/xlibi18n/lcCT.c
index 4eee21dcf..2fbe8aa88 100644
--- a/libX11/src/xlibi18n/lcCT.c
+++ b/libX11/src/xlibi18n/lcCT.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcCT.c,v 1.4 2000/08/17 19:45:16 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -36,7 +35,6 @@
* Modifier: Ivan Pascal The XFree86 Project
* Modifier: Bruno Haible The XFree86 Project
*/
-/* $XFree86: xc/lib/X11/lcCT.c,v 3.26 2001/10/28 03:32:34 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcCharSet.c b/libX11/src/xlibi18n/lcCharSet.c
index ceb07095a..0fa39d869 100644
--- a/libX11/src/xlibi18n/lcCharSet.c
+++ b/libX11/src/xlibi18n/lcCharSet.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcCharSet.c,v 1.3 2000/08/17 19:45:16 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.8 2001/01/17 19:41:53 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcConv.c b/libX11/src/xlibi18n/lcConv.c
index 9acb3519d..9797e7ed3 100644
--- a/libX11/src/xlibi18n/lcConv.c
+++ b/libX11/src/xlibi18n/lcConv.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcConv.c,v 1.4 2000/08/17 19:45:17 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcConv.c,v 1.5 2000/12/04 18:49:26 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcDB.c b/libX11/src/xlibi18n/lcDB.c
index 5cadf39c1..4a25ae69d 100644
--- a/libX11/src/xlibi18n/lcDB.c
+++ b/libX11/src/xlibi18n/lcDB.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcDB.c,v 1.6 2000/08/17 19:45:17 cpqbld Exp $ */
/*
*
* Copyright IBM Corporation 1993
@@ -28,7 +27,6 @@
* 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.15tsi Exp $ */
diff --git a/libX11/src/xlibi18n/lcDynamic.c b/libX11/src/xlibi18n/lcDynamic.c
index 46ef41368..8d022d885 100644
--- a/libX11/src/xlibi18n/lcDynamic.c
+++ b/libX11/src/xlibi18n/lcDynamic.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcDynamic.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */
/*
Copyright 1996, 1998 The Open Group
@@ -32,7 +31,6 @@ from The Open Group.
* Modifier: Takanori Tateno FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/lcDynamic.c,v 1.4 2001/01/17 19:41:53 dawes Exp $ */
/*
* A dynamically loaded locale.
diff --git a/libX11/src/xlibi18n/lcFile.c b/libX11/src/xlibi18n/lcFile.c
index f65b54e9f..4bab0217c 100644
--- a/libX11/src/xlibi18n/lcFile.c
+++ b/libX11/src/xlibi18n/lcFile.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcFile.c,v 1.5 2000/12/12 12:44:05 coskrey Exp $ */
/*
*
* Copyright IBM Corporation 1993
@@ -23,7 +22,6 @@
* SOFTWARE.
*
*/
-/* $XFree86: xc/lib/X11/lcFile.c,v 3.32 2003/03/25 04:18:09 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -219,7 +217,7 @@ _XlcParsePath(
#define XLOCALEDIR "locale"
#endif
-static void
+void
xlocaledir(
char *buf,
int buf_len)
diff --git a/libX11/src/xlibi18n/lcGeneric.c b/libX11/src/xlibi18n/lcGeneric.c
index 5cb8c5234..69ea97db8 100644
--- a/libX11/src/xlibi18n/lcGeneric.c
+++ b/libX11/src/xlibi18n/lcGeneric.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcGeneric.c,v 1.7 2000/12/12 12:44:05 coskrey Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -28,7 +27,6 @@
* 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.19 2003/05/27 16:55:27 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcInit.c b/libX11/src/xlibi18n/lcInit.c
index db774a92e..ee66b8c92 100644
--- a/libX11/src/xlibi18n/lcInit.c
+++ b/libX11/src/xlibi18n/lcInit.c
@@ -1,8 +1,6 @@
/*
Copyright 1985, 1986, 1987, 1991, 1998 The Open Group
-Portions Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
-
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
@@ -14,21 +12,18 @@ permission notice shall be included in all copies or substantial
portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP OR SUN MICROSYSTEMS, INC. BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE EVEN IF
-ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
-Except as contained in this notice, the names of The Open Group and/or
-Sun Microsystems, Inc. shall not be used in advertising or otherwise to
-promote the sale, use or other dealings in this Software without prior
-written authorization from The Open Group and/or Sun Microsystems,
-Inc., as applicable.
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
X Window System is a trademark of The Open Group
@@ -41,7 +36,29 @@ interest in or to any trademark, service mark, logo or trade name of
Sun Microsystems, Inc. or its licensors is granted.
*/
-/* $Xorg: lcInit.c,v 1.4 2000/12/12 12:44:05 coskrey Exp $ */
+/*
+ * Copyright 2000 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -74,7 +91,6 @@ Sun Microsystems, Inc. or its licensors is granted.
* Modifier: Masayoshi Shimamura FUJITSU LIMITED
*
*/
-/* $XFree86: xc/lib/X11/lcInit.c,v 3.9 2001/11/16 00:52:27 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcPrTxt.c b/libX11/src/xlibi18n/lcPrTxt.c
index 644759075..1b7627cf8 100644
--- a/libX11/src/xlibi18n/lcPrTxt.c
+++ b/libX11/src/xlibi18n/lcPrTxt.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcPrTxt.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.9 2003/04/03 22:34:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcPubWrap.c b/libX11/src/xlibi18n/lcPubWrap.c
index b579f956f..2a5ac08d8 100644
--- a/libX11/src/xlibi18n/lcPubWrap.c
+++ b/libX11/src/xlibi18n/lcPubWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcPubWrap.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.4 2001/01/17 19:41:55 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcPublic.c b/libX11/src/xlibi18n/lcPublic.c
index 851e2f535..2c02f5fba 100644
--- a/libX11/src/xlibi18n/lcPublic.c
+++ b/libX11/src/xlibi18n/lcPublic.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcPublic.c,v 1.4 2000/12/12 12:44:05 coskrey Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcPublic.c,v 1.11 2001/11/16 00:52:28 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcRM.c b/libX11/src/xlibi18n/lcRM.c
index 1ffa4ef72..9f72504ee 100644
--- a/libX11/src/xlibi18n/lcRM.c
+++ b/libX11/src/xlibi18n/lcRM.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcRM.c,v 1.3 2000/08/17 19:45:19 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -24,7 +23,6 @@
* mopi@osa.ilab.toshiba.co.jp
* Bug fixes: Bruno Haible XFree86 Inc.
*/
-/* $XFree86: xc/lib/X11/lcRM.c,v 1.4 2000/11/28 18:49:48 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcStd.c b/libX11/src/xlibi18n/lcStd.c
index 1c52013af..87f6b60b3 100644
--- a/libX11/src/xlibi18n/lcStd.c
+++ b/libX11/src/xlibi18n/lcStd.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcStd.c,v 1.4 2000/08/17 19:45:20 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcStd.c,v 1.6 2003/04/13 19:22:21 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcTxtPr.c b/libX11/src/xlibi18n/lcTxtPr.c
index 82071b109..4dfafe018 100644
--- a/libX11/src/xlibi18n/lcTxtPr.c
+++ b/libX11/src/xlibi18n/lcTxtPr.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcTxtPr.c,v 1.3 2000/08/17 19:45:20 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -23,7 +22,6 @@
* Author: Katsuhisa Yano TOSHIBA Corp.
* mopi@osa.ilab.toshiba.co.jp
*/
-/* $XFree86: xc/lib/X11/lcTxtPr.c,v 3.3 2001/01/17 19:41:55 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcUTF8.c b/libX11/src/xlibi18n/lcUTF8.c
index 95c68ad75..08906c695 100644
--- a/libX11/src/xlibi18n/lcUTF8.c
+++ b/libX11/src/xlibi18n/lcUTF8.c
@@ -1,4 +1,3 @@
-/* $TOG: $ */
/******************************************************************
Copyright 1993 by SunSoft, Inc.
@@ -24,7 +23,6 @@ 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.15 2002/10/08 23:31:36 dawes Exp $ */
/*
* This file contains:
diff --git a/libX11/src/xlibi18n/lcUniConv/8bit_tab_to_h.c b/libX11/src/xlibi18n/lcUniConv/8bit_tab_to_h.c
index ae5340cf3..1caa28a21 100644
--- a/libX11/src/xlibi18n/lcUniConv/8bit_tab_to_h.c
+++ b/libX11/src/xlibi18n/lcUniConv/8bit_tab_to_h.c
@@ -1,4 +1,3 @@
-/* $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/libX11/src/xlibi18n/lcUniConv/README b/libX11/src/xlibi18n/lcUniConv/README
index 5ea4f0566..53f39f2f4 100644
--- a/libX11/src/xlibi18n/lcUniConv/README
+++ b/libX11/src/xlibi18n/lcUniConv/README
@@ -1,4 +1,3 @@
-$XFree86$
The files in this directory are taken from the libiconv-1.1 package.
diff --git a/libX11/src/xlibi18n/lcUniConv/armscii_8.h b/libX11/src/xlibi18n/lcUniConv/armscii_8.h
index 6ca102eaa..567bfeac2 100644
--- a/libX11/src/xlibi18n/lcUniConv/armscii_8.h
+++ b/libX11/src/xlibi18n/lcUniConv/armscii_8.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/armscii_8.h,v 1.3 2000/11/29 17:40:28 dawes Exp $ */
/*
* ARMSCII-8
diff --git a/libX11/src/xlibi18n/lcUniConv/ascii.h b/libX11/src/xlibi18n/lcUniConv/ascii.h
index db8677d7f..e32cf417e 100644
--- a/libX11/src/xlibi18n/lcUniConv/ascii.h
+++ b/libX11/src/xlibi18n/lcUniConv/ascii.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ASCII
diff --git a/libX11/src/xlibi18n/lcUniConv/big5.h b/libX11/src/xlibi18n/lcUniConv/big5.h
index b356b5ebf..db439088b 100644
--- a/libX11/src/xlibi18n/lcUniConv/big5.h
+++ b/libX11/src/xlibi18n/lcUniConv/big5.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/big5.h,v 1.1tsi Exp $ */
/*
* BIG5
diff --git a/libX11/src/xlibi18n/lcUniConv/big5_emacs.h b/libX11/src/xlibi18n/lcUniConv/big5_emacs.h
index 4a8f6ed51..246aebeb4 100644
--- a/libX11/src/xlibi18n/lcUniConv/big5_emacs.h
+++ b/libX11/src/xlibi18n/lcUniConv/big5_emacs.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* BIG5-0 and BIG5-1
diff --git a/libX11/src/xlibi18n/lcUniConv/cjk_tab_to_h.c b/libX11/src/xlibi18n/lcUniConv/cjk_tab_to_h.c
index 971314476..6934789cf 100644
--- a/libX11/src/xlibi18n/lcUniConv/cjk_tab_to_h.c
+++ b/libX11/src/xlibi18n/lcUniConv/cjk_tab_to_h.c
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Generates a CJK character set table from a .TXT table as found on
diff --git a/libX11/src/xlibi18n/lcUniConv/cp1133.h b/libX11/src/xlibi18n/lcUniConv/cp1133.h
index 8b7ff5484..cf79b7aa1 100644
--- a/libX11/src/xlibi18n/lcUniConv/cp1133.h
+++ b/libX11/src/xlibi18n/lcUniConv/cp1133.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* IBM-CP1133
diff --git a/libX11/src/xlibi18n/lcUniConv/cp1251.h b/libX11/src/xlibi18n/lcUniConv/cp1251.h
index 166d5ba88..8c0847a0c 100644
--- a/libX11/src/xlibi18n/lcUniConv/cp1251.h
+++ b/libX11/src/xlibi18n/lcUniConv/cp1251.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* CP1251
diff --git a/libX11/src/xlibi18n/lcUniConv/cp1255.h b/libX11/src/xlibi18n/lcUniConv/cp1255.h
index f8e175d84..61b2b59d7 100644
--- a/libX11/src/xlibi18n/lcUniConv/cp1255.h
+++ b/libX11/src/xlibi18n/lcUniConv/cp1255.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* CP1255
diff --git a/libX11/src/xlibi18n/lcUniConv/cp1256.h b/libX11/src/xlibi18n/lcUniConv/cp1256.h
index 5097762aa..72284f4c1 100644
--- a/libX11/src/xlibi18n/lcUniConv/cp1256.h
+++ b/libX11/src/xlibi18n/lcUniConv/cp1256.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* CP1256
diff --git a/libX11/src/xlibi18n/lcUniConv/gb2312.h b/libX11/src/xlibi18n/lcUniConv/gb2312.h
index db900a478..2eec308d2 100644
--- a/libX11/src/xlibi18n/lcUniConv/gb2312.h
+++ b/libX11/src/xlibi18n/lcUniConv/gb2312.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/gb2312.h,v 1.4tsi Exp $ */
/*
* GB2312.1980-0
diff --git a/libX11/src/xlibi18n/lcUniConv/georgian_academy.h b/libX11/src/xlibi18n/lcUniConv/georgian_academy.h
index 230369014..0e4350461 100644
--- a/libX11/src/xlibi18n/lcUniConv/georgian_academy.h
+++ b/libX11/src/xlibi18n/lcUniConv/georgian_academy.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* GEORGIAN-ACADEMY
diff --git a/libX11/src/xlibi18n/lcUniConv/georgian_ps.h b/libX11/src/xlibi18n/lcUniConv/georgian_ps.h
index b7e30bf0c..b96c491df 100644
--- a/libX11/src/xlibi18n/lcUniConv/georgian_ps.h
+++ b/libX11/src/xlibi18n/lcUniConv/georgian_ps.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* GEORGIAN-PS
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_1.h b/libX11/src/xlibi18n/lcUniConv/iso8859_1.h
index 0b03e7023..fc302bb44 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_1.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_1.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-1
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_10.h b/libX11/src/xlibi18n/lcUniConv/iso8859_10.h
index f0ef2f694..508db5758 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_10.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_10.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-10
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_11.h b/libX11/src/xlibi18n/lcUniConv/iso8859_11.h
index 57eb016a8..5458da514 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_11.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_11.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/iso8859_11.h,v 1.1tsi Exp $ */
/*
* ISO8859-11
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_13.h b/libX11/src/xlibi18n/lcUniConv/iso8859_13.h
index 7ad1fd2a1..c041b154a 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_13.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_13.h
@@ -1,4 +1,3 @@
-/* $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/libX11/src/xlibi18n/lcUniConv/iso8859_14.h b/libX11/src/xlibi18n/lcUniConv/iso8859_14.h
index 7fd322ccf..f01581492 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_14.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_14.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-14
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_15.h b/libX11/src/xlibi18n/lcUniConv/iso8859_15.h
index 209ca21b8..631d9b5e2 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_15.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_15.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-15
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_16.h b/libX11/src/xlibi18n/lcUniConv/iso8859_16.h
index 657e4450d..99a54d98f 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_16.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_16.h
@@ -1,4 +1,3 @@
-/* $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/libX11/src/xlibi18n/lcUniConv/iso8859_2.h b/libX11/src/xlibi18n/lcUniConv/iso8859_2.h
index 67abd8556..a63d00424 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_2.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_2.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-2
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_3.h b/libX11/src/xlibi18n/lcUniConv/iso8859_3.h
index 399b7906a..2282f19cf 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_3.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_3.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-3
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_4.h b/libX11/src/xlibi18n/lcUniConv/iso8859_4.h
index f787fa858..878a7e44a 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_4.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_4.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-4
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_5.h b/libX11/src/xlibi18n/lcUniConv/iso8859_5.h
index 4a2e46e59..cdd6c45db 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_5.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_5.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-5
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_6.h b/libX11/src/xlibi18n/lcUniConv/iso8859_6.h
index 22c667139..4c80a64f5 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_6.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_6.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-6
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_7.h b/libX11/src/xlibi18n/lcUniConv/iso8859_7.h
index 2fb38cae1..9b500e4b3 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_7.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_7.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-7
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_8.h b/libX11/src/xlibi18n/lcUniConv/iso8859_8.h
index e9d77a22d..152dc3cae 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_8.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_8.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-8
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_9.h b/libX11/src/xlibi18n/lcUniConv/iso8859_9.h
index 662992d07..b94ac9de6 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_9.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_9.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* ISO-8859-9
diff --git a/libX11/src/xlibi18n/lcUniConv/iso8859_9e.h b/libX11/src/xlibi18n/lcUniConv/iso8859_9e.h
index 17ff75b03..cbab5816c 100644
--- a/libX11/src/xlibi18n/lcUniConv/iso8859_9e.h
+++ b/libX11/src/xlibi18n/lcUniConv/iso8859_9e.h
@@ -1,4 +1,3 @@
-/* $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/libX11/src/xlibi18n/lcUniConv/jisx0201.h b/libX11/src/xlibi18n/lcUniConv/jisx0201.h
index fec138a48..e4af9666f 100644
--- a/libX11/src/xlibi18n/lcUniConv/jisx0201.h
+++ b/libX11/src/xlibi18n/lcUniConv/jisx0201.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* JISX0201.1976-0
diff --git a/libX11/src/xlibi18n/lcUniConv/jisx0208.h b/libX11/src/xlibi18n/lcUniConv/jisx0208.h
index 4d8a8918a..5888f6f21 100644
--- a/libX11/src/xlibi18n/lcUniConv/jisx0208.h
+++ b/libX11/src/xlibi18n/lcUniConv/jisx0208.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/jisx0208.h,v 1.5tsi Exp $ */
/*
* JISX0208.1990-0
diff --git a/libX11/src/xlibi18n/lcUniConv/jisx0212.h b/libX11/src/xlibi18n/lcUniConv/jisx0212.h
index 6c89ee638..05cca5203 100644
--- a/libX11/src/xlibi18n/lcUniConv/jisx0212.h
+++ b/libX11/src/xlibi18n/lcUniConv/jisx0212.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/jisx0212.h,v 1.4tsi Exp $ */
/*
* JISX0212.1990-0
diff --git a/libX11/src/xlibi18n/lcUniConv/koi8_c.h b/libX11/src/xlibi18n/lcUniConv/koi8_c.h
index 504c2589c..d870a01db 100644
--- a/libX11/src/xlibi18n/lcUniConv/koi8_c.h
+++ b/libX11/src/xlibi18n/lcUniConv/koi8_c.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/koi8_c.h,v 1.1 2000/10/27 20:26:08 dawes Exp $ */
/*
* KOI8-C
diff --git a/libX11/src/xlibi18n/lcUniConv/koi8_r.h b/libX11/src/xlibi18n/lcUniConv/koi8_r.h
index dfbbb8dc3..37ca594f6 100644
--- a/libX11/src/xlibi18n/lcUniConv/koi8_r.h
+++ b/libX11/src/xlibi18n/lcUniConv/koi8_r.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* KOI8-R
diff --git a/libX11/src/xlibi18n/lcUniConv/koi8_u.h b/libX11/src/xlibi18n/lcUniConv/koi8_u.h
index 168d6a102..e094419bc 100644
--- a/libX11/src/xlibi18n/lcUniConv/koi8_u.h
+++ b/libX11/src/xlibi18n/lcUniConv/koi8_u.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* KOI8-U
diff --git a/libX11/src/xlibi18n/lcUniConv/ksc5601.h b/libX11/src/xlibi18n/lcUniConv/ksc5601.h
index 1b5c62d07..843dcff19 100644
--- a/libX11/src/xlibi18n/lcUniConv/ksc5601.h
+++ b/libX11/src/xlibi18n/lcUniConv/ksc5601.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/ksc5601.h,v 1.4tsi Exp $ */
/*
* KSC5601.1987-0
diff --git a/libX11/src/xlibi18n/lcUniConv/mulelao.h b/libX11/src/xlibi18n/lcUniConv/mulelao.h
index 0e331f81a..5b8245762 100644
--- a/libX11/src/xlibi18n/lcUniConv/mulelao.h
+++ b/libX11/src/xlibi18n/lcUniConv/mulelao.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* MULELAO-1
diff --git a/libX11/src/xlibi18n/lcUniConv/tatar_cyr.h b/libX11/src/xlibi18n/lcUniConv/tatar_cyr.h
index 5783fd925..471e5a79a 100644
--- a/libX11/src/xlibi18n/lcUniConv/tatar_cyr.h
+++ b/libX11/src/xlibi18n/lcUniConv/tatar_cyr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/tatar_cyr.h,v 1.2 2000/11/28 16:10:31 dawes Exp $ */
/*
* TATAR-CYR
diff --git a/libX11/src/xlibi18n/lcUniConv/tcvn.h b/libX11/src/xlibi18n/lcUniConv/tcvn.h
index eb80ab3f7..4662683dc 100644
--- a/libX11/src/xlibi18n/lcUniConv/tcvn.h
+++ b/libX11/src/xlibi18n/lcUniConv/tcvn.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* TCVN-5712
diff --git a/libX11/src/xlibi18n/lcUniConv/tis620.h b/libX11/src/xlibi18n/lcUniConv/tis620.h
index deda9769d..4fa96ec98 100644
--- a/libX11/src/xlibi18n/lcUniConv/tis620.h
+++ b/libX11/src/xlibi18n/lcUniConv/tis620.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/tis620.h,v 1.3 2000/11/29 17:40:35 dawes Exp $ */
/*
* TIS620-0
diff --git a/libX11/src/xlibi18n/lcUniConv/ucs2be.h b/libX11/src/xlibi18n/lcUniConv/ucs2be.h
index ff9acc39f..20a8b27bd 100644
--- a/libX11/src/xlibi18n/lcUniConv/ucs2be.h
+++ b/libX11/src/xlibi18n/lcUniConv/ucs2be.h
@@ -1,7 +1,6 @@
/*
* UCS-2BE = UCS-2 big endian
*/
-/* $XFree86$ */
static int
ucs2be_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
diff --git a/libX11/src/xlibi18n/lcUniConv/utf8.h b/libX11/src/xlibi18n/lcUniConv/utf8.h
index f8c2a7d8a..d00995ca0 100644
--- a/libX11/src/xlibi18n/lcUniConv/utf8.h
+++ b/libX11/src/xlibi18n/lcUniConv/utf8.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/lcUniConv/utf8.h,v 1.2 2000/11/28 16:10:32 dawes Exp $ */
/*
* UTF-8
diff --git a/libX11/src/xlibi18n/lcUniConv/viscii.h b/libX11/src/xlibi18n/lcUniConv/viscii.h
index f7dfd4473..d5147e81e 100644
--- a/libX11/src/xlibi18n/lcUniConv/viscii.h
+++ b/libX11/src/xlibi18n/lcUniConv/viscii.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* VISCII1.1-1
diff --git a/libX11/src/xlibi18n/lcUtil.c b/libX11/src/xlibi18n/lcUtil.c
index 2fbbd0210..196bca20c 100644
--- a/libX11/src/xlibi18n/lcUtil.c
+++ b/libX11/src/xlibi18n/lcUtil.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcUtil.c,v 1.3 2000/08/17 19:45:20 cpqbld Exp $ */
/*
* Copyright 1992, 1993 by TOSHIBA Corp.
*
@@ -24,7 +23,6 @@
* mopi@osa.ilab.toshiba.co.jp
* Bug fixes: Bruno Haible XFree86 Inc.
*/
-/* $XFree86: xc/lib/X11/lcUtil.c,v 1.3 2000/11/29 17:40:24 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/lcWrap.c b/libX11/src/xlibi18n/lcWrap.c
index fc6e95566..c3f5ca531 100644
--- a/libX11/src/xlibi18n/lcWrap.c
+++ b/libX11/src/xlibi18n/lcWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: lcWrap.c,v 1.6 2001/02/09 02:03:39 xorgcvs Exp $ */
/*
Copyright 1991, 1998 The Open Group
@@ -53,7 +52,6 @@ from The Open Group.
*
* Katsuhisa Yano TOSHIBA Corp.
*/
-/* $XFree86: xc/lib/X11/lcWrap.c,v 3.15 2003/04/13 19:22:22 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/mbWMProps.c b/libX11/src/xlibi18n/mbWMProps.c
index a5f7732e4..bff7aa352 100644
--- a/libX11/src/xlibi18n/mbWMProps.c
+++ b/libX11/src/xlibi18n/mbWMProps.c
@@ -1,4 +1,3 @@
-/* $Xorg: mbWMProps.c,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */
/*
Copyright 1991, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/X11/mbWMProps.c,v 1.5 2001/12/14 19:54:10 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/mbWrap.c b/libX11/src/xlibi18n/mbWrap.c
index 5c1a9dd75..19f01f656 100644
--- a/libX11/src/xlibi18n/mbWrap.c
+++ b/libX11/src/xlibi18n/mbWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: mbWrap.c,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */
/*
Copyright 1991, 1998 The Open Group
@@ -50,7 +49,6 @@ from The Open Group.
*
* M. Collins OSF
*/
-/* $XFree86: xc/lib/X11/mbWrap.c,v 1.6 2001/12/14 19:54:10 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/utf8WMProps.c b/libX11/src/xlibi18n/utf8WMProps.c
index e3a329ac8..bbfb7c057 100644
--- a/libX11/src/xlibi18n/utf8WMProps.c
+++ b/libX11/src/xlibi18n/utf8WMProps.c
@@ -1,4 +1,3 @@
-/* $TOG: mbWMProps.c /main/6 1998/02/06 17:44:24 kaleb $ */
/*
Copyright 1991, 1998 The Open Group
@@ -48,7 +47,6 @@ 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.2 2001/12/14 19:54:11 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/utf8Wrap.c b/libX11/src/xlibi18n/utf8Wrap.c
index 8d902509b..82967b0b1 100644
--- a/libX11/src/xlibi18n/utf8Wrap.c
+++ b/libX11/src/xlibi18n/utf8Wrap.c
@@ -1,4 +1,3 @@
-/* $TOG: mbWrap.c /main/7 1998/02/06 17:44:30 kaleb $ */
/*
Copyright 1991, 1998 The Open Group
@@ -72,7 +71,6 @@ 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.3 2001/12/14 19:54:11 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libX11/src/xlibi18n/wcWrap.c b/libX11/src/xlibi18n/wcWrap.c
index 41161d590..cc3b33f7d 100644
--- a/libX11/src/xlibi18n/wcWrap.c
+++ b/libX11/src/xlibi18n/wcWrap.c
@@ -1,4 +1,3 @@
-/* $Xorg: wcWrap.c,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */
/*
Copyright 1991, 1998 The Open Group
@@ -51,7 +50,6 @@ from The Open Group.
*
* M. Collins OSF
*/
-/* $XFree86: xc/lib/X11/wcWrap.c,v 1.6 2001/12/14 19:54:11 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>