Package=libx11
Merge_Strategy=
Interactive=no
QUIET=0
Package_version=
MANUAL_MERGE=no
Using package libx11
Warning:  overwriting existing dir libx11
Cloning from Debian repository...
Initialized empty Git repository in /srv/XorgAutoPackage/libx11/.git/
Already on branch "debian-unstable"
Fetching from freedesktop repository...
remote: Generating pack...
remote: Done counting 316 objects.
remote: Result has 229 objects.
remote: Deltifying 229 objects.
remote:    0% (0/229) done
remote:    1% (3/229) done
remote:    2% (5/229) done
remote:    3% (7/229) done
remote:    4% (10/229) done
remote:    5% (12/229) done
remote:    6% (14/229) done
remote:    7% (17/229) done
remote:    8% (19/229) done
remote:    9% (21/229) done
remote:   10% (23/229) done
remote:   11% (26/229) done
remote:   12% (28/229) done
remote:   13% (30/229) done
remote:   14% (33/229) done
remote:   15% (35/229) done
remote:   16% (37/229) done
remote:   17% (39/229) done
remote:   18% (42/229) done
remote:   19% (44/229) done
remote:   20% (46/229) done
remote:   21% (49/229) done
remote:   22% (51/229) done
remote:   23% (53/229) done
remote:   24% (55/229) done
remote:   25% (58/229) done
remote:   26% (60/229) done
remote:   27% (62/229) done
remote:   28% (65/229) done
remote:   29% (67/229) done
remote:   30% (69/229) done
remote:   31% (71/229) done
remote:   32% (74/229) done
remote:   33% (76/229) done
remote:   34% (78/229) done
remote:   35% (81/229) done
remote:   36% (83/229) done
remote:   37% (85/229) done
remote:   38% (88/229) done
remote:   39% (90/229) done
remote:   40% (92/229) done
remote:   41% (94/229) done
remote:   42% (97/229) done
remote:   43% (99/229) done
remote:   44% (101/229) done
remote:   45% (104/229) done
remote:   46% (106/229) done
remote:   47% (108/229) done
remote:   48% (110/229) done
remote:   49% (113/229) done
remote:   50% (115/229) done
remote:   51% (117/229) done
remote:   52% (120/229) done
remote:   53% (122/229) done
remote:   54% (124/229) done
remote:   55% (126/229) done
remote:   56% (129/229) done
remote:   57% (131/229) done
remote:   58% (133/229) done
remote:   59% (136/229) done
remote:   60% (138/229) done
remote:   61% (140/229) done
remote:   62% (142/229) done
remote:   63% (145/229) done
remote:   64% (147/229) done
remote:   65% (149/229) done
remote:   66% (152/229) done
remote:   67% (154/229) done
remote:   68% (156/229) done
remote:   69% (159/229) done
remote:   70% (161/229) done
remote:   71% (163/229) done
remote:   72% (165/229) done
remote:   73% (168/229) done
remote:   74% (170/229) done
remote:   75% (172/229) done
remote:   76% (175/229) done
remote:   77% (177/229) done
remote:   78% (179/229) done
remote:   79% (181/229) done
remote:   80% (184/229) done
remote:   81% (186/229) done
remote:   82% (188/229) done
remote:   83% (191/229) done
remote:   84% (193/229) done
remote:   85% (195/229) done
remote:   86% (197/229) done
remote:   87% (200/229) done
remote:   88% (202/229) done
remote:   89% (204/229) done
remote:   90% (207/229) done
remote:   91% (209/229) done
remote:   92% (211/229) done
remote:   93% (213/229) done
remote:   94% (216/229) done
remote:   95% (218/229) done
remote:   96% (220/229) done
remote:   97% (223/229) done
remote:   98% (225/229) done
remote:   99% (227/229) done
remote:  100% (229/229) done
remote: 
remote: Total 229, written 229 (delta 187), reused 0 (delta 0)
* refs/heads/upstream-head: storing branch 'master' of git://git.freedesktop.org/git/xorg/lib/libX11
  commit: e8d4cef
Auto-following refs/tags/libX11-1.1.2
Auto-following refs/tags/libX11-1.1.3
remote: Generating pack...
remote: Done counting 2 objects.
remote: Deltifying 2 objects.
remote:   50% (1/2) done
 100% (2/2) done
remote: 
remote: Total 2, written 2 (delta 0), reused 0 (delta 0)
* refs/tags/libX11-1.1.2: storing tag 'libX11-1.1.2' of git://git.freedesktop.org/git/xorg/lib/libX11
  tag: 89a36af
* refs/tags/libX11-1.1.3: storing tag 'libX11-1.1.3' of git://git.freedesktop.org/git/xorg/lib/libX11
  tag: aa5fb4e
Switched to a new branch "mybranch"
Merging Debian changes...
Auto-merged AUTHORS
CONFLICT (add/add): Merge conflict in AUTHORS
Auto-merged Makefile.am
CONFLICT (add/add): Merge conflict in Makefile.am
Auto-merged NEWS
CONFLICT (add/add): Merge conflict in NEWS
Auto-merged README
CONFLICT (add/add): Merge conflict in README
Auto-merged acinclude.m4
CONFLICT (add/add): Merge conflict in acinclude.m4
Auto-merged configure.ac
CONFLICT (add/add): Merge conflict in configure.ac
Auto-merged cpprules.in
CONFLICT (add/add): Merge conflict in cpprules.in
Auto-merged include/Makefile.am
CONFLICT (add/add): Merge conflict in include/Makefile.am
Auto-merged include/X11/Xlibint.h
CONFLICT (add/add): Merge conflict in include/X11/Xlibint.h
Auto-merged man/AllPlanes.man
CONFLICT (add/add): Merge conflict in man/AllPlanes.man
Auto-merged man/BlackPixelOfScreen.man
CONFLICT (add/add): Merge conflict in man/BlackPixelOfScreen.man
Auto-merged man/DisplayOfCCC.man
CONFLICT (add/add): Merge conflict in man/DisplayOfCCC.man
Auto-merged man/ImageByteOrder.man
CONFLICT (add/add): Merge conflict in man/ImageByteOrder.man
Auto-merged man/IsCursorKey.man
CONFLICT (add/add): Merge conflict in man/IsCursorKey.man
Auto-merged man/Makefile.am
CONFLICT (add/add): Merge conflict in man/Makefile.am
Auto-merged man/XAddConnectionWatch.man
CONFLICT (add/add): Merge conflict in man/XAddConnectionWatch.man
Auto-merged man/XAddHost.man
CONFLICT (add/add): Merge conflict in man/XAddHost.man
Auto-merged man/XAllocClassHint.man
CONFLICT (add/add): Merge conflict in man/XAllocClassHint.man
Auto-merged man/XAllocColor.man
CONFLICT (add/add): Merge conflict in man/XAllocColor.man
Auto-merged man/XAllocIconSize.man
CONFLICT (add/add): Merge conflict in man/XAllocIconSize.man
Auto-merged man/XAllocSizeHints.man
CONFLICT (add/add): Merge conflict in man/XAllocSizeHints.man
Auto-merged man/XAllocStandardColormap.man
CONFLICT (add/add): Merge conflict in man/XAllocStandardColormap.man
Auto-merged man/XAllocWMHints.man
CONFLICT (add/add): Merge conflict in man/XAllocWMHints.man
Auto-merged man/XAllowEvents.man
CONFLICT (add/add): Merge conflict in man/XAllowEvents.man
Auto-merged man/XAnyEvent.man
CONFLICT (add/add): Merge conflict in man/XAnyEvent.man
Auto-merged man/XButtonEvent.man
CONFLICT (add/add): Merge conflict in man/XButtonEvent.man
Auto-merged man/XChangeKeyboardControl.man
CONFLICT (add/add): Merge conflict in man/XChangeKeyboardControl.man
Auto-merged man/XChangeKeyboardMapping.man
CONFLICT (add/add): Merge conflict in man/XChangeKeyboardMapping.man
Auto-merged man/XChangePointerControl.man
CONFLICT (add/add): Merge conflict in man/XChangePointerControl.man
Auto-merged man/XChangeSaveSet.man
CONFLICT (add/add): Merge conflict in man/XChangeSaveSet.man
Auto-merged man/XChangeWindowAttributes.man
CONFLICT (add/add): Merge conflict in man/XChangeWindowAttributes.man
Auto-merged man/XCirculateEvent.man
CONFLICT (add/add): Merge conflict in man/XCirculateEvent.man
Auto-merged man/XCirculateRequestEvent.man
CONFLICT (add/add): Merge conflict in man/XCirculateRequestEvent.man
Auto-merged man/XClearArea.man
CONFLICT (add/add): Merge conflict in man/XClearArea.man
Auto-merged man/XClientMessageEvent.man
CONFLICT (add/add): Merge conflict in man/XClientMessageEvent.man
Auto-merged man/XColormapEvent.man
CONFLICT (add/add): Merge conflict in man/XColormapEvent.man
Auto-merged man/XConfigureEvent.man
CONFLICT (add/add): Merge conflict in man/XConfigureEvent.man
Auto-merged man/XConfigureRequestEvent.man
CONFLICT (add/add): Merge conflict in man/XConfigureRequestEvent.man
Auto-merged man/XConfigureWindow.man
CONFLICT (add/add): Merge conflict in man/XConfigureWindow.man
Auto-merged man/XCopyArea.man
CONFLICT (add/add): Merge conflict in man/XCopyArea.man
Auto-merged man/XCreateColormap.man
CONFLICT (add/add): Merge conflict in man/XCreateColormap.man
Auto-merged man/XCreateFontCursor.man
CONFLICT (add/add): Merge conflict in man/XCreateFontCursor.man
Auto-merged man/XCreateFontSet.man
CONFLICT (add/add): Merge conflict in man/XCreateFontSet.man
Auto-merged man/XCreateGC.man
CONFLICT (add/add): Merge conflict in man/XCreateGC.man
Auto-merged man/XCreateIC.man
CONFLICT (add/add): Merge conflict in man/XCreateIC.man
Auto-merged man/XCreateOC.man
CONFLICT (add/add): Merge conflict in man/XCreateOC.man
Auto-merged man/XCreatePixmap.man
CONFLICT (add/add): Merge conflict in man/XCreatePixmap.man
Auto-merged man/XCreateRegion.man
CONFLICT (add/add): Merge conflict in man/XCreateRegion.man
Auto-merged man/XCreateWindow.man
CONFLICT (add/add): Merge conflict in man/XCreateWindow.man
Auto-merged man/XCreateWindowEvent.man
CONFLICT (add/add): Merge conflict in man/XCreateWindowEvent.man
Auto-merged man/XCrossingEvent.man
CONFLICT (add/add): Merge conflict in man/XCrossingEvent.man
Auto-merged man/XDefineCursor.man
CONFLICT (add/add): Merge conflict in man/XDefineCursor.man
Auto-merged man/XDestroyWindow.man
CONFLICT (add/add): Merge conflict in man/XDestroyWindow.man
Auto-merged man/XDestroyWindowEvent.man
CONFLICT (add/add): Merge conflict in man/XDestroyWindowEvent.man
Auto-merged man/XDrawArc.man
CONFLICT (add/add): Merge conflict in man/XDrawArc.man
Auto-merged man/XDrawImageString.man
CONFLICT (add/add): Merge conflict in man/XDrawImageString.man
Auto-merged man/XDrawLine.man
CONFLICT (add/add): Merge conflict in man/XDrawLine.man
Auto-merged man/XDrawPoint.man
CONFLICT (add/add): Merge conflict in man/XDrawPoint.man
Auto-merged man/XDrawRectangle.man
CONFLICT (add/add): Merge conflict in man/XDrawRectangle.man
Auto-merged man/XDrawString.man
CONFLICT (add/add): Merge conflict in man/XDrawString.man
Auto-merged man/XDrawText.man
CONFLICT (add/add): Merge conflict in man/XDrawText.man
Auto-merged man/XEmptyRegion.man
CONFLICT (add/add): Merge conflict in man/XEmptyRegion.man
Auto-merged man/XErrorEvent.man
CONFLICT (add/add): Merge conflict in man/XErrorEvent.man
Auto-merged man/XExposeEvent.man
CONFLICT (add/add): Merge conflict in man/XExposeEvent.man
Auto-merged man/XExtentsOfFontSet.man
CONFLICT (add/add): Merge conflict in man/XExtentsOfFontSet.man
Auto-merged man/XFillRectangle.man
CONFLICT (add/add): Merge conflict in man/XFillRectangle.man
Auto-merged man/XFilterEvent.man
CONFLICT (add/add): Merge conflict in man/XFilterEvent.man
Auto-merged man/XFlush.man
CONFLICT (add/add): Merge conflict in man/XFlush.man
Auto-merged man/XFocusChangeEvent.man
CONFLICT (add/add): Merge conflict in man/XFocusChangeEvent.man
Auto-merged man/XFontSetExtents.man
CONFLICT (add/add): Merge conflict in man/XFontSetExtents.man
Auto-merged man/XFontsOfFontSet.man
CONFLICT (add/add): Merge conflict in man/XFontsOfFontSet.man
Auto-merged man/XFree.man
CONFLICT (add/add): Merge conflict in man/XFree.man
Auto-merged man/XGetVisualInfo.man
CONFLICT (add/add): Merge conflict in man/XGetVisualInfo.man
Auto-merged man/XGetWindowAttributes.man
CONFLICT (add/add): Merge conflict in man/XGetWindowAttributes.man
Auto-merged man/XGetWindowProperty.man
CONFLICT (add/add): Merge conflict in man/XGetWindowProperty.man
Auto-merged man/XGrabButton.man
CONFLICT (add/add): Merge conflict in man/XGrabButton.man
Auto-merged man/XGrabKey.man
CONFLICT (add/add): Merge conflict in man/XGrabKey.man
Auto-merged man/XGrabKeyboard.man
CONFLICT (add/add): Merge conflict in man/XGrabKeyboard.man
Auto-merged man/XGrabPointer.man
CONFLICT (add/add): Merge conflict in man/XGrabPointer.man
Auto-merged man/XGrabServer.man
CONFLICT (add/add): Merge conflict in man/XGrabServer.man
Auto-merged man/XGraphicsExposeEvent.man
CONFLICT (add/add): Merge conflict in man/XGraphicsExposeEvent.man
Auto-merged man/XGravityEvent.man
CONFLICT (add/add): Merge conflict in man/XGravityEvent.man
Auto-merged man/XIconifyWindow.man
CONFLICT (add/add): Merge conflict in man/XIconifyWindow.man
Auto-merged man/XIfEvent.man
CONFLICT (add/add): Merge conflict in man/XIfEvent.man
Auto-merged man/XInitImage.man
CONFLICT (add/add): Merge conflict in man/XInitImage.man
Auto-merged man/XInitThreads.man
CONFLICT (add/add): Merge conflict in man/XInitThreads.man
Auto-merged man/XInstallColormap.man
CONFLICT (add/add): Merge conflict in man/XInstallColormap.man
Auto-merged man/XInternAtom.man
CONFLICT (add/add): Merge conflict in man/XInternAtom.man
Auto-merged man/XIntersectRegion.man
CONFLICT (add/add): Merge conflict in man/XIntersectRegion.man
Auto-merged man/XKeymapEvent.man
CONFLICT (add/add): Merge conflict in man/XKeymapEvent.man
Auto-merged man/XListFonts.man
CONFLICT (add/add): Merge conflict in man/XListFonts.man
Auto-merged man/XLoadFont.man
CONFLICT (add/add): Merge conflict in man/XLoadFont.man
Auto-merged man/XLookupKeysym.man
CONFLICT (add/add): Merge conflict in man/XLookupKeysym.man
Auto-merged man/XMapEvent.man
CONFLICT (add/add): Merge conflict in man/XMapEvent.man
Auto-merged man/XMapRequestEvent.man
CONFLICT (add/add): Merge conflict in man/XMapRequestEvent.man
Auto-merged man/XMapWindow.man
CONFLICT (add/add): Merge conflict in man/XMapWindow.man
Auto-merged man/XNextEvent.man
CONFLICT (add/add): Merge conflict in man/XNextEvent.man
Auto-merged man/XNoOp.man
CONFLICT (add/add): Merge conflict in man/XNoOp.man
Auto-merged man/XOpenDisplay.man
CONFLICT (add/add): Merge conflict in man/XOpenDisplay.man
Auto-merged man/XOpenIM.man
CONFLICT (add/add): Merge conflict in man/XOpenIM.man
Auto-merged man/XOpenOM.man
CONFLICT (add/add): Merge conflict in man/XOpenOM.man
Auto-merged man/XParseGeometry.man
CONFLICT (add/add): Merge conflict in man/XParseGeometry.man
Auto-merged man/XPolygonRegion.man
CONFLICT (add/add): Merge conflict in man/XPolygonRegion.man
Auto-merged man/XPropertyEvent.man
CONFLICT (add/add): Merge conflict in man/XPropertyEvent.man
Auto-merged man/XPutBackEvent.man
CONFLICT (add/add): Merge conflict in man/XPutBackEvent.man
Auto-merged man/XPutImage.man
CONFLICT (add/add): Merge conflict in man/XPutImage.man
Auto-merged man/XQueryBestSize.man
CONFLICT (add/add): Merge conflict in man/XQueryBestSize.man
Auto-merged man/XQueryColor.man
CONFLICT (add/add): Merge conflict in man/XQueryColor.man
Auto-merged man/XQueryExtension.man
CONFLICT (add/add): Merge conflict in man/XQueryExtension.man
Auto-merged man/XQueryPointer.man
CONFLICT (add/add): Merge conflict in man/XQueryPointer.man
Auto-merged man/XQueryTree.man
CONFLICT (add/add): Merge conflict in man/XQueryTree.man
Auto-merged man/XRaiseWindow.man
CONFLICT (add/add): Merge conflict in man/XRaiseWindow.man
Auto-merged man/XReadBitmapFile.man
CONFLICT (add/add): Merge conflict in man/XReadBitmapFile.man
Auto-merged man/XRecolorCursor.man
CONFLICT (add/add): Merge conflict in man/XRecolorCursor.man
Auto-merged man/XReparentEvent.man
CONFLICT (add/add): Merge conflict in man/XReparentEvent.man
Auto-merged man/XReparentWindow.man
CONFLICT (add/add): Merge conflict in man/XReparentWindow.man
Auto-merged man/XResizeRequestEvent.man
CONFLICT (add/add): Merge conflict in man/XResizeRequestEvent.man
Auto-merged man/XResourceManagerString.man
CONFLICT (add/add): Merge conflict in man/XResourceManagerString.man
Auto-merged man/XSaveContext.man
CONFLICT (add/add): Merge conflict in man/XSaveContext.man
Auto-merged man/XSelectInput.man
CONFLICT (add/add): Merge conflict in man/XSelectInput.man
Auto-merged man/XSelectionClearEvent.man
CONFLICT (add/add): Merge conflict in man/XSelectionClearEvent.man
Auto-merged man/XSelectionEvent.man
CONFLICT (add/add): Merge conflict in man/XSelectionEvent.man
Auto-merged man/XSelectionRequestEvent.man
CONFLICT (add/add): Merge conflict in man/XSelectionRequestEvent.man
Auto-merged man/XSendEvent.man
CONFLICT (add/add): Merge conflict in man/XSendEvent.man
Auto-merged man/XSetArcMode.man
CONFLICT (add/add): Merge conflict in man/XSetArcMode.man
Auto-merged man/XSetClipOrigin.man
CONFLICT (add/add): Merge conflict in man/XSetClipOrigin.man
Auto-merged man/XSetCloseDownMode.man
CONFLICT (add/add): Merge conflict in man/XSetCloseDownMode.man
Auto-merged man/XSetCommand.man
CONFLICT (add/add): Merge conflict in man/XSetCommand.man
Auto-merged man/XSetErrorHandler.man
CONFLICT (add/add): Merge conflict in man/XSetErrorHandler.man
Auto-merged man/XSetFillStyle.man
CONFLICT (add/add): Merge conflict in man/XSetFillStyle.man
Auto-merged man/XSetFont.man
CONFLICT (add/add): Merge conflict in man/XSetFont.man
Auto-merged man/XSetFontPath.man
CONFLICT (add/add): Merge conflict in man/XSetFontPath.man
Auto-merged man/XSetICFocus.man
CONFLICT (add/add): Merge conflict in man/XSetICFocus.man
Auto-merged man/XSetICValues.man
CONFLICT (add/add): Merge conflict in man/XSetICValues.man
Auto-merged man/XSetInputFocus.man
CONFLICT (add/add): Merge conflict in man/XSetInputFocus.man
Auto-merged man/XSetLineAttributes.man
CONFLICT (add/add): Merge conflict in man/XSetLineAttributes.man
Auto-merged man/XSetPointerMapping.man
CONFLICT (add/add): Merge conflict in man/XSetPointerMapping.man
Auto-merged man/XSetScreenSaver.man
CONFLICT (add/add): Merge conflict in man/XSetScreenSaver.man
Auto-merged man/XSetSelectionOwner.man
CONFLICT (add/add): Merge conflict in man/XSetSelectionOwner.man
Auto-merged man/XSetState.man
CONFLICT (add/add): Merge conflict in man/XSetState.man
Auto-merged man/XSetTextProperty.man
CONFLICT (add/add): Merge conflict in man/XSetTextProperty.man
Auto-merged man/XSetTile.man
CONFLICT (add/add): Merge conflict in man/XSetTile.man
Auto-merged man/XSetTransientForHint.man
CONFLICT (add/add): Merge conflict in man/XSetTransientForHint.man
Auto-merged man/XSetWMClientMachine.man
CONFLICT (add/add): Merge conflict in man/XSetWMClientMachine.man
Auto-merged man/XSetWMColormapWindows.man
CONFLICT (add/add): Merge conflict in man/XSetWMColormapWindows.man
Auto-merged man/XSetWMIconName.man
CONFLICT (add/add): Merge conflict in man/XSetWMIconName.man
Auto-merged man/XSetWMName.man
CONFLICT (add/add): Merge conflict in man/XSetWMName.man
Auto-merged man/XSetWMProperties.man
CONFLICT (add/add): Merge conflict in man/XSetWMProperties.man
Auto-merged man/XSetWMProtocols.man
CONFLICT (add/add): Merge conflict in man/XSetWMProtocols.man
Auto-merged man/XStoreBytes.man
CONFLICT (add/add): Merge conflict in man/XStoreBytes.man
Auto-merged man/XStoreColors.man
CONFLICT (add/add): Merge conflict in man/XStoreColors.man
Auto-merged man/XStringListToTextProperty.man
CONFLICT (add/add): Merge conflict in man/XStringListToTextProperty.man
Auto-merged man/XStringToKeysym.man
CONFLICT (add/add): Merge conflict in man/XStringToKeysym.man
Auto-merged man/XSupportsLocale.man
CONFLICT (add/add): Merge conflict in man/XSupportsLocale.man
Auto-merged man/XSynchronize.man
CONFLICT (add/add): Merge conflict in man/XSynchronize.man
Auto-merged man/XTextExtents.man
CONFLICT (add/add): Merge conflict in man/XTextExtents.man
Auto-merged man/XTextWidth.man
CONFLICT (add/add): Merge conflict in man/XTextWidth.man
Auto-merged man/XTranslateCoordinates.man
CONFLICT (add/add): Merge conflict in man/XTranslateCoordinates.man
Auto-merged man/XUnmapEvent.man
CONFLICT (add/add): Merge conflict in man/XUnmapEvent.man
Auto-merged man/XUnmapWindow.man
CONFLICT (add/add): Merge conflict in man/XUnmapWindow.man
Auto-merged man/XVaCreateNestedList.man
CONFLICT (add/add): Merge conflict in man/XVaCreateNestedList.man
Auto-merged man/XVisibilityEvent.man
CONFLICT (add/add): Merge conflict in man/XVisibilityEvent.man
Auto-merged man/XWarpPointer.man
CONFLICT (add/add): Merge conflict in man/XWarpPointer.man
Auto-merged man/XcmsAllocColor.man
CONFLICT (add/add): Merge conflict in man/XcmsAllocColor.man
Auto-merged man/XcmsCCCOfColormap.man
CONFLICT (add/add): Merge conflict in man/XcmsCCCOfColormap.man
Auto-merged man/XcmsCIELabQueryMaxC.man
CONFLICT (add/add): Merge conflict in man/XcmsCIELabQueryMaxC.man
Auto-merged man/XcmsCIELuvQueryMaxC.man
CONFLICT (add/add): Merge conflict in man/XcmsCIELuvQueryMaxC.man
Auto-merged man/XcmsColor.man
CONFLICT (add/add): Merge conflict in man/XcmsColor.man
Auto-merged man/XcmsConvertColors.man
CONFLICT (add/add): Merge conflict in man/XcmsConvertColors.man
Auto-merged man/XcmsCreateCCC.man
CONFLICT (add/add): Merge conflict in man/XcmsCreateCCC.man
Auto-merged man/XcmsDefaultCCC.man
CONFLICT (add/add): Merge conflict in man/XcmsDefaultCCC.man
Auto-merged man/XcmsQueryBlack.man
CONFLICT (add/add): Merge conflict in man/XcmsQueryBlack.man
Auto-merged man/XcmsQueryColor.man
CONFLICT (add/add): Merge conflict in man/XcmsQueryColor.man
Auto-merged man/XcmsSetWhitePoint.man
CONFLICT (add/add): Merge conflict in man/XcmsSetWhitePoint.man
Auto-merged man/XcmsStoreColor.man
CONFLICT (add/add): Merge conflict in man/XcmsStoreColor.man
Auto-merged man/XcmsTekHVCQueryMaxC.man
CONFLICT (add/add): Merge conflict in man/XcmsTekHVCQueryMaxC.man
Auto-merged man/XmbDrawImageString.man
CONFLICT (add/add): Merge conflict in man/XmbDrawImageString.man
Auto-merged man/XmbDrawString.man
CONFLICT (add/add): Merge conflict in man/XmbDrawString.man
Auto-merged man/XmbDrawText.man
CONFLICT (add/add): Merge conflict in man/XmbDrawText.man
Auto-merged man/XmbLookupString.man
CONFLICT (add/add): Merge conflict in man/XmbLookupString.man
Auto-merged man/XmbResetIC.man
CONFLICT (add/add): Merge conflict in man/XmbResetIC.man
Auto-merged man/XmbTextEscapement.man
CONFLICT (add/add): Merge conflict in man/XmbTextEscapement.man
Auto-merged man/XmbTextExtents.man
CONFLICT (add/add): Merge conflict in man/XmbTextExtents.man
Auto-merged man/XmbTextListToTextProperty.man
CONFLICT (add/add): Merge conflict in man/XmbTextListToTextProperty.man
Auto-merged man/XmbTextPerCharExtents.man
CONFLICT (add/add): Merge conflict in man/XmbTextPerCharExtents.man
Auto-merged man/XrmEnumerateDatabase.man
CONFLICT (add/add): Merge conflict in man/XrmEnumerateDatabase.man
Auto-merged man/XrmGetFileDatabase.man
CONFLICT (add/add): Merge conflict in man/XrmGetFileDatabase.man
Auto-merged man/XrmGetResource.man
CONFLICT (add/add): Merge conflict in man/XrmGetResource.man
Auto-merged man/XrmInitialize.man
CONFLICT (add/add): Merge conflict in man/XrmInitialize.man
Auto-merged man/XrmMergeDatabases.man
CONFLICT (add/add): Merge conflict in man/XrmMergeDatabases.man
Auto-merged man/XrmPutResource.man
CONFLICT (add/add): Merge conflict in man/XrmPutResource.man
Auto-merged man/XrmUniqueQuark.man
CONFLICT (add/add): Merge conflict in man/XrmUniqueQuark.man
Auto-merged modules/im/ximcp/imDefIm.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imDefIm.c
Auto-merged modules/im/ximcp/imDefLkup.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imDefLkup.c
Auto-merged modules/im/ximcp/imExten.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imExten.c
Auto-merged modules/im/ximcp/imInt.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imInt.c
Auto-merged modules/im/ximcp/imLcIm.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imLcIm.c
Auto-merged modules/im/ximcp/imLcPrs.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imLcPrs.c
Auto-merged modules/im/ximcp/imRm.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imRm.c
Auto-merged modules/im/ximcp/imTrX.c
CONFLICT (add/add): Merge conflict in modules/im/ximcp/imTrX.c
Auto-merged modules/lc/gen/lcGenConv.c
CONFLICT (add/add): Merge conflict in modules/lc/gen/lcGenConv.c
Auto-merged modules/om/generic/omGeneric.c
CONFLICT (add/add): Merge conflict in modules/om/generic/omGeneric.c
Auto-merged modules/om/generic/omXChar.c
CONFLICT (add/add): Merge conflict in modules/om/generic/omXChar.c
Auto-merged nls/Makefile.am
CONFLICT (add/add): Merge conflict in nls/Makefile.am
Auto-merged nls/compose.dir.pre
CONFLICT (add/add): Merge conflict in nls/compose.dir.pre
Auto-merged nls/el_GR.UTF-8/Compose.pre
CONFLICT (add/add): Merge conflict in nls/el_GR.UTF-8/Compose.pre
Auto-merged nls/en_US.UTF-8/Compose.pre
CONFLICT (add/add): Merge conflict in nls/en_US.UTF-8/Compose.pre
Auto-merged nls/en_US.UTF-8/XI18N_OBJS
CONFLICT (add/add): Merge conflict in nls/en_US.UTF-8/XI18N_OBJS
Auto-merged nls/iso8859-13/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-13/Compose.pre
Auto-merged nls/iso8859-14/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-14/Compose.pre
Auto-merged nls/iso8859-15/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-15/Compose.pre
Auto-merged nls/iso8859-2/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-2/Compose.pre
Auto-merged nls/iso8859-3/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-3/Compose.pre
Auto-merged nls/iso8859-4/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-4/Compose.pre
Auto-merged nls/iso8859-7/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-7/Compose.pre
Auto-merged nls/iso8859-9/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-9/Compose.pre
Auto-merged nls/iso8859-9e/Compose.pre
CONFLICT (add/add): Merge conflict in nls/iso8859-9e/Compose.pre
Auto-merged nls/locale.alias.pre
CONFLICT (add/add): Merge conflict in nls/locale.alias.pre
Auto-merged nls/locale.dir.pre
CONFLICT (add/add): Merge conflict in nls/locale.dir.pre
Auto-merged nls/pt_BR.UTF-8/Compose.pre
CONFLICT (add/add): Merge conflict in nls/pt_BR.UTF-8/Compose.pre
Auto-merged nls/vi_VN.tcvn/Compose.pre
CONFLICT (add/add): Merge conflict in nls/vi_VN.tcvn/Compose.pre
Auto-merged nls/vi_VN.viscii/Compose.pre
CONFLICT (add/add): Merge conflict in nls/vi_VN.viscii/Compose.pre
Auto-merged src/AllCells.c
CONFLICT (add/add): Merge conflict in src/AllCells.c
Auto-merged src/AllPlanes.c
CONFLICT (add/add): Merge conflict in src/AllPlanes.c
Auto-merged src/AllowEv.c
CONFLICT (add/add): Merge conflict in src/AllowEv.c
Auto-merged src/AutoRep.c
CONFLICT (add/add): Merge conflict in src/AutoRep.c
Auto-merged src/Backgnd.c
CONFLICT (add/add): Merge conflict in src/Backgnd.c
Auto-merged src/BdrWidth.c
CONFLICT (add/add): Merge conflict in src/BdrWidth.c
Auto-merged src/Bell.c
CONFLICT (add/add): Merge conflict in src/Bell.c
Auto-merged src/Border.c
CONFLICT (add/add): Merge conflict in src/Border.c
Auto-merged src/ChAccCon.c
CONFLICT (add/add): Merge conflict in src/ChAccCon.c
Auto-merged src/ChActPGb.c
CONFLICT (add/add): Merge conflict in src/ChActPGb.c
Auto-merged src/ChClMode.c
CONFLICT (add/add): Merge conflict in src/ChClMode.c
Auto-merged src/ChCmap.c
CONFLICT (add/add): Merge conflict in src/ChCmap.c
Auto-merged src/ChGC.c
CONFLICT (add/add): Merge conflict in src/ChGC.c
Auto-merged src/ChKeyCon.c
CONFLICT (add/add): Merge conflict in src/ChKeyCon.c
Auto-merged src/ChPntCon.c
CONFLICT (add/add): Merge conflict in src/ChPntCon.c
Auto-merged src/ChSaveSet.c
CONFLICT (add/add): Merge conflict in src/ChSaveSet.c
Auto-merged src/ChWAttrs.c
CONFLICT (add/add): Merge conflict in src/ChWAttrs.c
Auto-merged src/ChWindow.c
CONFLICT (add/add): Merge conflict in src/ChWindow.c
Auto-merged src/ChkIfEv.c
CONFLICT (add/add): Merge conflict in src/ChkIfEv.c
Auto-merged src/ChkMaskEv.c
CONFLICT (add/add): Merge conflict in src/ChkMaskEv.c
Auto-merged src/ChkTypEv.c
CONFLICT (add/add): Merge conflict in src/ChkTypEv.c
Auto-merged src/ChkTypWEv.c
CONFLICT (add/add): Merge conflict in src/ChkTypWEv.c
Auto-merged src/ChkWinEv.c
CONFLICT (add/add): Merge conflict in src/ChkWinEv.c
Auto-merged src/CirWin.c
CONFLICT (add/add): Merge conflict in src/CirWin.c
Auto-merged src/CirWinDn.c
CONFLICT (add/add): Merge conflict in src/CirWinDn.c
Auto-merged src/CirWinUp.c
CONFLICT (add/add): Merge conflict in src/CirWinUp.c
Auto-merged src/ClDisplay.c
CONFLICT (add/add): Merge conflict in src/ClDisplay.c
Auto-merged src/Clear.c
CONFLICT (add/add): Merge conflict in src/Clear.c
Auto-merged src/ClearArea.c
CONFLICT (add/add): Merge conflict in src/ClearArea.c
Auto-merged src/ConfWind.c
CONFLICT (add/add): Merge conflict in src/ConfWind.c
Auto-merged src/ConnDis.c
CONFLICT (add/add): Merge conflict in src/ConnDis.c
Auto-merged src/ConvSel.c
CONFLICT (add/add): Merge conflict in src/ConvSel.c
Auto-merged src/CopyArea.c
CONFLICT (add/add): Merge conflict in src/CopyArea.c
Auto-merged src/CopyCmap.c
CONFLICT (add/add): Merge conflict in src/CopyCmap.c
Auto-merged src/CopyGC.c
CONFLICT (add/add): Merge conflict in src/CopyGC.c
Auto-merged src/CopyPlane.c
CONFLICT (add/add): Merge conflict in src/CopyPlane.c
Auto-merged src/CrCmap.c
CONFLICT (add/add): Merge conflict in src/CrCmap.c
Auto-merged src/CrCursor.c
CONFLICT (add/add): Merge conflict in src/CrCursor.c
Auto-merged src/CrGC.c
CONFLICT (add/add): Merge conflict in src/CrGC.c
Auto-merged src/CrGlCur.c
CONFLICT (add/add): Merge conflict in src/CrGlCur.c
Auto-merged src/CrPFBData.c
CONFLICT (add/add): Merge conflict in src/CrPFBData.c
Auto-merged src/CrPixmap.c
CONFLICT (add/add): Merge conflict in src/CrPixmap.c
Auto-merged src/CrWindow.c
CONFLICT (add/add): Merge conflict in src/CrWindow.c
Auto-merged src/Cursor.c
CONFLICT (add/add): Merge conflict in src/Cursor.c
Auto-merged src/DefCursor.c
CONFLICT (add/add): Merge conflict in src/DefCursor.c
Auto-merged src/DelProp.c
CONFLICT (add/add): Merge conflict in src/DelProp.c
Auto-merged src/Depths.c
CONFLICT (add/add): Merge conflict in src/Depths.c
Auto-merged src/DestSubs.c
CONFLICT (add/add): Merge conflict in src/DestSubs.c
Auto-merged src/DestWind.c
CONFLICT (add/add): Merge conflict in src/DestWind.c
Auto-merged src/DrArc.c
CONFLICT (add/add): Merge conflict in src/DrArc.c
Auto-merged src/DrArcs.c
CONFLICT (add/add): Merge conflict in src/DrArcs.c
Auto-merged src/DrLine.c
CONFLICT (add/add): Merge conflict in src/DrLine.c
Auto-merged src/DrLines.c
CONFLICT (add/add): Merge conflict in src/DrLines.c
Auto-merged src/DrPoint.c
CONFLICT (add/add): Merge conflict in src/DrPoint.c
Auto-merged src/DrPoints.c
CONFLICT (add/add): Merge conflict in src/DrPoints.c
Auto-merged src/DrRect.c
CONFLICT (add/add): Merge conflict in src/DrRect.c
Auto-merged src/DrRects.c
CONFLICT (add/add): Merge conflict in src/DrRects.c
Auto-merged src/DrSegs.c
CONFLICT (add/add): Merge conflict in src/DrSegs.c
Auto-merged src/ErrDes.c
CONFLICT (add/add): Merge conflict in src/ErrDes.c
Auto-merged src/FSSaver.c
CONFLICT (add/add): Merge conflict in src/FSSaver.c
Auto-merged src/FSWrap.c
CONFLICT (add/add): Merge conflict in src/FSWrap.c
Auto-merged src/FetchName.c
CONFLICT (add/add): Merge conflict in src/FetchName.c
Auto-merged src/FillArc.c
CONFLICT (add/add): Merge conflict in src/FillArc.c
Auto-merged src/FillArcs.c
CONFLICT (add/add): Merge conflict in src/FillArcs.c
Auto-merged src/FillPoly.c
CONFLICT (add/add): Merge conflict in src/FillPoly.c
Auto-merged src/FillRct.c
CONFLICT (add/add): Merge conflict in src/FillRct.c
Auto-merged src/FillRcts.c
CONFLICT (add/add): Merge conflict in src/FillRcts.c
Auto-merged src/FilterEv.c
CONFLICT (add/add): Merge conflict in src/FilterEv.c
Auto-merged src/Flush.c
CONFLICT (add/add): Merge conflict in src/Flush.c
Auto-merged src/Font.c
CONFLICT (add/add): Merge conflict in src/Font.c
Auto-merged src/FontInfo.c
CONFLICT (add/add): Merge conflict in src/FontInfo.c
Auto-merged src/FontNames.c
CONFLICT (add/add): Merge conflict in src/FontNames.c
Auto-merged src/FreeCmap.c
CONFLICT (add/add): Merge conflict in src/FreeCmap.c
Auto-merged src/FreeCols.c
CONFLICT (add/add): Merge conflict in src/FreeCols.c
Auto-merged src/FreeCurs.c
CONFLICT (add/add): Merge conflict in src/FreeCurs.c
Auto-merged src/FreeEData.c
CONFLICT (add/add): Merge conflict in src/FreeEData.c
Auto-merged src/FreeGC.c
CONFLICT (add/add): Merge conflict in src/FreeGC.c
Auto-merged src/FreePix.c
CONFLICT (add/add): Merge conflict in src/FreePix.c
Auto-merged src/GCMisc.c
CONFLICT (add/add): Merge conflict in src/GCMisc.c
Auto-merged src/GetAtomNm.c
CONFLICT (add/add): Merge conflict in src/GetAtomNm.c
Auto-merged src/GetColor.c
CONFLICT (add/add): Merge conflict in src/GetColor.c
Auto-merged src/GetDflt.c
CONFLICT (add/add): Merge conflict in src/GetDflt.c
Auto-merged src/GetFPath.c
CONFLICT (add/add): Merge conflict in src/GetFPath.c
Auto-merged src/GetFProp.c
CONFLICT (add/add): Merge conflict in src/GetFProp.c
Auto-merged src/GetGCVals.c
CONFLICT (add/add): Merge conflict in src/GetGCVals.c
Auto-merged src/GetGeom.c
CONFLICT (add/add): Merge conflict in src/GetGeom.c
Auto-merged src/GetHColor.c
CONFLICT (add/add): Merge conflict in src/GetHColor.c
Auto-merged src/GetHints.c
CONFLICT (add/add): Merge conflict in src/GetHints.c
Auto-merged src/GetIFocus.c
CONFLICT (add/add): Merge conflict in src/GetIFocus.c
Auto-merged src/GetImage.c
CONFLICT (add/add): Merge conflict in src/GetImage.c
Auto-merged src/GetKCnt.c
CONFLICT (add/add): Merge conflict in src/GetKCnt.c
Auto-merged src/GetMoEv.c
CONFLICT (add/add): Merge conflict in src/GetMoEv.c
Auto-merged src/GetNrmHint.c
CONFLICT (add/add): Merge conflict in src/GetNrmHint.c
Auto-merged src/GetPCnt.c
CONFLICT (add/add): Merge conflict in src/GetPCnt.c
Auto-merged src/GetPntMap.c
CONFLICT (add/add): Merge conflict in src/GetPntMap.c
Auto-merged src/GetProp.c
CONFLICT (add/add): Merge conflict in src/GetProp.c
Auto-merged src/GetRGBCMap.c
CONFLICT (add/add): Merge conflict in src/GetRGBCMap.c
Auto-merged src/GetSOwner.c
CONFLICT (add/add): Merge conflict in src/GetSOwner.c
Auto-merged src/GetSSaver.c
CONFLICT (add/add): Merge conflict in src/GetSSaver.c
Auto-merged src/GetStCmap.c
CONFLICT (add/add): Merge conflict in src/GetStCmap.c
Auto-merged src/GetTxtProp.c
CONFLICT (add/add): Merge conflict in src/GetTxtProp.c
Auto-merged src/GetWMCMapW.c
CONFLICT (add/add): Merge conflict in src/GetWMCMapW.c
Auto-merged src/GetWMProto.c
CONFLICT (add/add): Merge conflict in src/GetWMProto.c
Auto-merged src/GrButton.c
CONFLICT (add/add): Merge conflict in src/GrButton.c
Auto-merged src/GrKey.c
CONFLICT (add/add): Merge conflict in src/GrKey.c
Auto-merged src/GrKeybd.c
CONFLICT (add/add): Merge conflict in src/GrKeybd.c
Auto-merged src/GrPointer.c
CONFLICT (add/add): Merge conflict in src/GrPointer.c
Auto-merged src/GrServer.c
CONFLICT (add/add): Merge conflict in src/GrServer.c
Auto-merged src/Iconify.c
CONFLICT (add/add): Merge conflict in src/Iconify.c
Auto-merged src/IfEvent.c
CONFLICT (add/add): Merge conflict in src/IfEvent.c
Auto-merged src/ImUtil.c
CONFLICT (add/add): Merge conflict in src/ImUtil.c
Auto-merged src/InitExt.c
CONFLICT (add/add): Merge conflict in src/InitExt.c
Auto-merged src/InsCmap.c
CONFLICT (add/add): Merge conflict in src/InsCmap.c
Auto-merged src/IntAtom.c
CONFLICT (add/add): Merge conflict in src/IntAtom.c
Auto-merged src/KeyBind.c
CONFLICT (add/add): Merge conflict in src/KeyBind.c
Auto-merged src/KeysymStr.c
CONFLICT (add/add): Merge conflict in src/KeysymStr.c
Auto-merged src/KillCl.c
CONFLICT (add/add): Merge conflict in src/KillCl.c
Auto-merged src/LiHosts.c
CONFLICT (add/add): Merge conflict in src/LiHosts.c
Auto-merged src/LiICmaps.c
CONFLICT (add/add): Merge conflict in src/LiICmaps.c
Auto-merged src/LiProps.c
CONFLICT (add/add): Merge conflict in src/LiProps.c
Auto-merged src/ListExt.c
CONFLICT (add/add): Merge conflict in src/ListExt.c
Auto-merged src/LookupCol.c
CONFLICT (add/add): Merge conflict in src/LookupCol.c
Auto-merged src/LowerWin.c
CONFLICT (add/add): Merge conflict in src/LowerWin.c
Auto-merged src/Macros.c
CONFLICT (add/add): Merge conflict in src/Macros.c
Auto-merged src/Makefile.am
CONFLICT (add/add): Merge conflict in src/Makefile.am
Auto-merged src/MapRaised.c
CONFLICT (add/add): Merge conflict in src/MapRaised.c
Auto-merged src/MapSubs.c
CONFLICT (add/add): Merge conflict in src/MapSubs.c
Auto-merged src/MapWindow.c
CONFLICT (add/add): Merge conflict in src/MapWindow.c
Auto-merged src/MaskEvent.c
CONFLICT (add/add): Merge conflict in src/MaskEvent.c
Auto-merged src/Misc.c
CONFLICT (add/add): Merge conflict in src/Misc.c
Auto-merged src/ModMap.c
CONFLICT (add/add): Merge conflict in src/ModMap.c
Auto-merged src/MoveWin.c
CONFLICT (add/add): Merge conflict in src/MoveWin.c
Auto-merged src/NextEvent.c
CONFLICT (add/add): Merge conflict in src/NextEvent.c
Auto-merged src/OCWrap.c
CONFLICT (add/add): Merge conflict in src/OCWrap.c
Auto-merged src/OMWrap.c
CONFLICT (add/add): Merge conflict in src/OMWrap.c
Auto-merged src/OpenDis.c
CONFLICT (add/add): Merge conflict in src/OpenDis.c
Auto-merged src/ParseCmd.c
CONFLICT (add/add): Merge conflict in src/ParseCmd.c
Auto-merged src/ParseCol.c
CONFLICT (add/add): Merge conflict in src/ParseCol.c
Auto-merged src/PeekEvent.c
CONFLICT (add/add): Merge conflict in src/PeekEvent.c
Auto-merged src/PeekIfEv.c
CONFLICT (add/add): Merge conflict in src/PeekIfEv.c
Auto-merged src/Pending.c
CONFLICT (add/add): Merge conflict in src/Pending.c
Auto-merged src/PixFormats.c
CONFLICT (add/add): Merge conflict in src/PixFormats.c
Auto-merged src/PmapBgnd.c
CONFLICT (add/add): Merge conflict in src/PmapBgnd.c
Auto-merged src/PmapBord.c
CONFLICT (add/add): Merge conflict in src/PmapBord.c
Auto-merged src/PolyReg.c
CONFLICT (add/add): Merge conflict in src/PolyReg.c
Auto-merged src/PolyTxt.c
CONFLICT (add/add): Merge conflict in src/PolyTxt.c
Auto-merged src/PolyTxt16.c
CONFLICT (add/add): Merge conflict in src/PolyTxt16.c
Auto-merged src/PropAlloc.c
CONFLICT (add/add): Merge conflict in src/PropAlloc.c
Auto-merged src/PutImage.c
CONFLICT (add/add): Merge conflict in src/PutImage.c
Auto-merged src/QuBest.c
CONFLICT (add/add): Merge conflict in src/QuBest.c
Auto-merged src/QuColor.c
CONFLICT (add/add): Merge conflict in src/QuColor.c
Auto-merged src/QuColors.c
CONFLICT (add/add): Merge conflict in src/QuColors.c
Auto-merged src/QuCurShp.c
CONFLICT (add/add): Merge conflict in src/QuCurShp.c
Auto-merged src/QuKeybd.c
CONFLICT (add/add): Merge conflict in src/QuKeybd.c
Auto-merged src/QuPntr.c
CONFLICT (add/add): Merge conflict in src/QuPntr.c
Auto-merged src/QuStipShp.c
CONFLICT (add/add): Merge conflict in src/QuStipShp.c
Auto-merged src/QuTileShp.c
CONFLICT (add/add): Merge conflict in src/QuTileShp.c
Auto-merged src/QuTree.c
CONFLICT (add/add): Merge conflict in src/QuTree.c
Auto-merged src/Quarks.c
CONFLICT (add/add): Merge conflict in src/Quarks.c
Auto-merged src/RaiseWin.c
CONFLICT (add/add): Merge conflict in src/RaiseWin.c
Auto-merged src/RdBitF.c
CONFLICT (add/add): Merge conflict in src/RdBitF.c
Auto-merged src/RecolorC.c
CONFLICT (add/add): Merge conflict in src/RecolorC.c
Auto-merged src/ReconfWM.c
CONFLICT (add/add): Merge conflict in src/ReconfWM.c
Auto-merged src/ReconfWin.c
CONFLICT (add/add): Merge conflict in src/ReconfWin.c
Auto-merged src/RepWindow.c
CONFLICT (add/add): Merge conflict in src/RepWindow.c
Auto-merged src/RestackWs.c
CONFLICT (add/add): Merge conflict in src/RestackWs.c
Auto-merged src/RotProp.c
CONFLICT (add/add): Merge conflict in src/RotProp.c
Auto-merged src/ScrResStr.c
CONFLICT (add/add): Merge conflict in src/ScrResStr.c
Auto-merged src/SelInput.c
CONFLICT (add/add): Merge conflict in src/SelInput.c
Auto-merged src/SendEvent.c
CONFLICT (add/add): Merge conflict in src/SendEvent.c
Auto-merged src/SetBack.c
CONFLICT (add/add): Merge conflict in src/SetBack.c
Auto-merged src/SetCRects.c
CONFLICT (add/add): Merge conflict in src/SetCRects.c
Auto-merged src/SetClMask.c
CONFLICT (add/add): Merge conflict in src/SetClMask.c
Auto-merged src/SetClOrig.c
CONFLICT (add/add): Merge conflict in src/SetClOrig.c
Auto-merged src/SetFPath.c
CONFLICT (add/add): Merge conflict in src/SetFPath.c
Auto-merged src/SetFont.c
CONFLICT (add/add): Merge conflict in src/SetFont.c
Auto-merged src/SetFore.c
CONFLICT (add/add): Merge conflict in src/SetFore.c
Auto-merged src/SetFunc.c
CONFLICT (add/add): Merge conflict in src/SetFunc.c
Auto-merged src/SetHints.c
CONFLICT (add/add): Merge conflict in src/SetHints.c
Auto-merged src/SetIFocus.c
CONFLICT (add/add): Merge conflict in src/SetIFocus.c
Auto-merged src/SetLStyle.c
CONFLICT (add/add): Merge conflict in src/SetLStyle.c
Auto-merged src/SetLocale.c
CONFLICT (add/add): Merge conflict in src/SetLocale.c
Auto-merged src/SetNrmHint.c
CONFLICT (add/add): Merge conflict in src/SetNrmHint.c
Auto-merged src/SetPMask.c
CONFLICT (add/add): Merge conflict in src/SetPMask.c
Auto-merged src/SetPntMap.c
CONFLICT (add/add): Merge conflict in src/SetPntMap.c
Auto-merged src/SetRGBCMap.c
CONFLICT (add/add): Merge conflict in src/SetRGBCMap.c
Auto-merged src/SetSOwner.c
CONFLICT (add/add): Merge conflict in src/SetSOwner.c
Auto-merged src/SetSSaver.c
CONFLICT (add/add): Merge conflict in src/SetSSaver.c
Auto-merged src/SetStCmap.c
CONFLICT (add/add): Merge conflict in src/SetStCmap.c
Auto-merged src/SetState.c
CONFLICT (add/add): Merge conflict in src/SetState.c
Auto-merged src/SetStip.c
CONFLICT (add/add): Merge conflict in src/SetStip.c
Auto-merged src/SetTSOrig.c
CONFLICT (add/add): Merge conflict in src/SetTSOrig.c
Auto-merged src/SetTile.c
CONFLICT (add/add): Merge conflict in src/SetTile.c
Auto-merged src/SetTxtProp.c
CONFLICT (add/add): Merge conflict in src/SetTxtProp.c
Auto-merged src/SetWMCMapW.c
CONFLICT (add/add): Merge conflict in src/SetWMCMapW.c
Auto-merged src/SetWMProto.c
CONFLICT (add/add): Merge conflict in src/SetWMProto.c
Auto-merged src/StBytes.c
CONFLICT (add/add): Merge conflict in src/StBytes.c
Auto-merged src/StColor.c
CONFLICT (add/add): Merge conflict in src/StColor.c
Auto-merged src/StColors.c
CONFLICT (add/add): Merge conflict in src/StColors.c
Auto-merged src/StNColor.c
CONFLICT (add/add): Merge conflict in src/StNColor.c
Auto-merged src/StrKeysym.c
CONFLICT (add/add): Merge conflict in src/StrKeysym.c
Auto-merged src/StrToText.c
CONFLICT (add/add): Merge conflict in src/StrToText.c
Auto-merged src/Sync.c
CONFLICT (add/add): Merge conflict in src/Sync.c
Auto-merged src/TextToStr.c
CONFLICT (add/add): Merge conflict in src/TextToStr.c
Auto-merged src/TrCoords.c
CONFLICT (add/add): Merge conflict in src/TrCoords.c
Auto-merged src/UndefCurs.c
CONFLICT (add/add): Merge conflict in src/UndefCurs.c
Auto-merged src/UngrabBut.c
CONFLICT (add/add): Merge conflict in src/UngrabBut.c
Auto-merged src/UngrabKbd.c
CONFLICT (add/add): Merge conflict in src/UngrabKbd.c
Auto-merged src/UngrabKey.c
CONFLICT (add/add): Merge conflict in src/UngrabKey.c
Auto-merged src/UngrabPtr.c
CONFLICT (add/add): Merge conflict in src/UngrabPtr.c
Auto-merged src/UngrabSvr.c
CONFLICT (add/add): Merge conflict in src/UngrabSvr.c
Auto-merged src/UninsCmap.c
CONFLICT (add/add): Merge conflict in src/UninsCmap.c
Auto-merged src/UnldFont.c
CONFLICT (add/add): Merge conflict in src/UnldFont.c
Auto-merged src/UnmapSubs.c
CONFLICT (add/add): Merge conflict in src/UnmapSubs.c
Auto-merged src/UnmapWin.c
CONFLICT (add/add): Merge conflict in src/UnmapWin.c
Auto-merged src/VisUtil.c
CONFLICT (add/add): Merge conflict in src/VisUtil.c
Auto-merged src/WMProps.c
CONFLICT (add/add): Merge conflict in src/WMProps.c
Auto-merged src/WarpPtr.c
CONFLICT (add/add): Merge conflict in src/WarpPtr.c
Auto-merged src/WinEvent.c
CONFLICT (add/add): Merge conflict in src/WinEvent.c
Auto-merged src/Window.c
CONFLICT (add/add): Merge conflict in src/Window.c
Auto-merged src/Withdraw.c
CONFLICT (add/add): Merge conflict in src/Withdraw.c
Auto-merged src/WrBitF.c
CONFLICT (add/add): Merge conflict in src/WrBitF.c
Auto-merged src/XErrorDB
CONFLICT (add/add): Merge conflict in src/XErrorDB
Auto-merged src/XKeysymDB
CONFLICT (add/add): Merge conflict in src/XKeysymDB
Auto-merged src/Xintconn.h
CONFLICT (add/add): Merge conflict in src/Xintconn.h
Auto-merged src/XlibAsync.c
CONFLICT (add/add): Merge conflict in src/XlibAsync.c
Auto-merged src/XlibInt.c
CONFLICT (add/add): Merge conflict in src/XlibInt.c
Auto-merged src/Xrm.c
CONFLICT (add/add): Merge conflict in src/Xrm.c
Auto-merged src/imConv.c
CONFLICT (add/add): Merge conflict in src/imConv.c
Auto-merged src/util/Makefile.am
CONFLICT (add/add): Merge conflict in src/util/Makefile.am
Auto-merged src/xcms/AddDIC.c
CONFLICT (add/add): Merge conflict in src/xcms/AddDIC.c
Auto-merged src/xcms/AddSF.c
CONFLICT (add/add): Merge conflict in src/xcms/AddSF.c
Auto-merged src/xcms/CCC.c
CONFLICT (add/add): Merge conflict in src/xcms/CCC.c
Auto-merged src/xcms/CvCols.c
CONFLICT (add/add): Merge conflict in src/xcms/CvCols.c
Auto-merged src/xcms/HVC.c
CONFLICT (add/add): Merge conflict in src/xcms/HVC.c
Auto-merged src/xcms/HVCGcC.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCGcC.c
Auto-merged src/xcms/HVCGcV.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCGcV.c
Auto-merged src/xcms/HVCGcVC.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCGcVC.c
Auto-merged src/xcms/HVCMnV.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCMnV.c
Auto-merged src/xcms/HVCMxC.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCMxC.c
Auto-merged src/xcms/HVCMxV.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCMxV.c
Auto-merged src/xcms/HVCMxVC.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCMxVC.c
Auto-merged src/xcms/HVCMxVs.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCMxVs.c
Auto-merged src/xcms/HVCWpAj.c
CONFLICT (add/add): Merge conflict in src/xcms/HVCWpAj.c
Auto-merged src/xcms/IdOfPr.c
CONFLICT (add/add): Merge conflict in src/xcms/IdOfPr.c
Auto-merged src/xcms/LRGB.c
CONFLICT (add/add): Merge conflict in src/xcms/LRGB.c
Auto-merged src/xcms/Lab.c
CONFLICT (add/add): Merge conflict in src/xcms/Lab.c
Auto-merged src/xcms/LabGcC.c
CONFLICT (add/add): Merge conflict in src/xcms/LabGcC.c
Auto-merged src/xcms/LabGcL.c
CONFLICT (add/add): Merge conflict in src/xcms/LabGcL.c
Auto-merged src/xcms/LabGcLC.c
CONFLICT (add/add): Merge conflict in src/xcms/LabGcLC.c
Auto-merged src/xcms/LabMnL.c
CONFLICT (add/add): Merge conflict in src/xcms/LabMnL.c
Auto-merged src/xcms/LabMxC.c
CONFLICT (add/add): Merge conflict in src/xcms/LabMxC.c
Auto-merged src/xcms/LabMxL.c
CONFLICT (add/add): Merge conflict in src/xcms/LabMxL.c
Auto-merged src/xcms/LabMxLC.c
CONFLICT (add/add): Merge conflict in src/xcms/LabMxLC.c
Auto-merged src/xcms/LabWpAj.c
CONFLICT (add/add): Merge conflict in src/xcms/LabWpAj.c
Auto-merged src/xcms/Luv.c
CONFLICT (add/add): Merge conflict in src/xcms/Luv.c
Auto-merged src/xcms/LuvGcC.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvGcC.c
Auto-merged src/xcms/LuvGcL.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvGcL.c
Auto-merged src/xcms/LuvGcLC.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvGcLC.c
Auto-merged src/xcms/LuvMnL.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvMnL.c
Auto-merged src/xcms/LuvMxC.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvMxC.c
Auto-merged src/xcms/LuvMxL.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvMxL.c
Auto-merged src/xcms/LuvMxLC.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvMxLC.c
Auto-merged src/xcms/LuvWpAj.c
CONFLICT (add/add): Merge conflict in src/xcms/LuvWpAj.c
Auto-merged src/xcms/Makefile.am
CONFLICT (add/add): Merge conflict in src/xcms/Makefile.am
Auto-merged src/xcms/OfCCC.c
CONFLICT (add/add): Merge conflict in src/xcms/OfCCC.c
Auto-merged src/xcms/PrOfId.c
CONFLICT (add/add): Merge conflict in src/xcms/PrOfId.c
Auto-merged src/xcms/QBlack.c
CONFLICT (add/add): Merge conflict in src/xcms/QBlack.c
Auto-merged src/xcms/QBlue.c
CONFLICT (add/add): Merge conflict in src/xcms/QBlue.c
Auto-merged src/xcms/QGreen.c
CONFLICT (add/add): Merge conflict in src/xcms/QGreen.c
Auto-merged src/xcms/QRed.c
CONFLICT (add/add): Merge conflict in src/xcms/QRed.c
Auto-merged src/xcms/QWhite.c
CONFLICT (add/add): Merge conflict in src/xcms/QWhite.c
Auto-merged src/xcms/QuCol.c
CONFLICT (add/add): Merge conflict in src/xcms/QuCol.c
Auto-merged src/xcms/QuCols.c
CONFLICT (add/add): Merge conflict in src/xcms/QuCols.c
Auto-merged src/xcms/SetCCC.c
CONFLICT (add/add): Merge conflict in src/xcms/SetCCC.c
Auto-merged src/xcms/StCol.c
CONFLICT (add/add): Merge conflict in src/xcms/StCol.c
Auto-merged src/xcms/StCols.c
CONFLICT (add/add): Merge conflict in src/xcms/StCols.c
Auto-merged src/xcms/XYZ.c
CONFLICT (add/add): Merge conflict in src/xcms/XYZ.c
Auto-merged src/xcms/cmsAllCol.c
CONFLICT (add/add): Merge conflict in src/xcms/cmsAllCol.c
Auto-merged src/xcms/cmsCmap.c
CONFLICT (add/add): Merge conflict in src/xcms/cmsCmap.c
Auto-merged src/xcms/cmsColNm.c
CONFLICT (add/add): Merge conflict in src/xcms/cmsColNm.c
Auto-merged src/xcms/cmsMath.c
CONFLICT (add/add): Merge conflict in src/xcms/cmsMath.c
Auto-merged src/xcms/cmsTrig.c
CONFLICT (add/add): Merge conflict in src/xcms/cmsTrig.c
Auto-merged src/xcms/uvY.c
CONFLICT (add/add): Merge conflict in src/xcms/uvY.c
Auto-merged src/xcms/xyY.c
CONFLICT (add/add): Merge conflict in src/xcms/xyY.c
Auto-merged src/xkb/Makefile.am
CONFLICT (add/add): Merge conflict in src/xkb/Makefile.am
Auto-merged src/xkb/XKBCvt.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBCvt.c
Auto-merged src/xkb/XKBExtDev.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBExtDev.c
Auto-merged src/xkb/XKBGeom.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBGeom.c
Auto-merged src/xkb/XKBGetMap.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBGetMap.c
Auto-merged src/xkb/XKBRdBuf.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBRdBuf.c
Auto-merged src/xkb/XKBSetGeom.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBSetGeom.c
Auto-merged src/xkb/XKBleds.c
CONFLICT (add/add): Merge conflict in src/xkb/XKBleds.c
Auto-merged src/xkb/XKBlibint.h
CONFLICT (add/add): Merge conflict in src/xkb/XKBlibint.h
Auto-merged src/xlibi18n/Makefile.am
CONFLICT (add/add): Merge conflict in src/xlibi18n/Makefile.am
Auto-merged src/xlibi18n/XDefaultIMIF.c
CONFLICT (add/add): Merge conflict in src/xlibi18n/XDefaultIMIF.c
Auto-merged src/xlibi18n/XimTrInt.h
CONFLICT (add/add): Merge conflict in src/xlibi18n/XimTrInt.h
Auto-merged src/xlibi18n/Ximint.h
CONFLICT (add/add): Merge conflict in src/xlibi18n/Ximint.h
Auto-merged src/xlibi18n/XlcPubI.h
CONFLICT (add/add): Merge conflict in src/xlibi18n/XlcPubI.h
Auto-merged src/xlibi18n/Xlcint.h
CONFLICT (add/add): Merge conflict in src/xlibi18n/Xlcint.h
Auto-merged src/xlibi18n/lcCT.c
CONFLICT (add/add): Merge conflict in src/xlibi18n/lcCT.c
Auto-merged src/xlibi18n/lcDB.c
CONFLICT (add/add): Merge conflict in src/xlibi18n/lcDB.c
Auto-merged src/xlibi18n/lcFile.c
CONFLICT (add/add): Merge conflict in src/xlibi18n/lcFile.c
Auto-merged x11.pc.in
CONFLICT (add/add): Merge conflict in x11.pc.in
Automatic merge failed; fix conflicts and then commit the result.
Merges needed
# On branch mybranch
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   ChangeLog
#	new file:   Makefile.in
#	new file:   aclocal.m4
#	new file:   compile
#	new file:   config.guess
#	new file:   config.sub
#	new file:   configure
#	new file:   debian/changelog
#	new file:   debian/compat
#	new file:   debian/control
#	new file:   debian/copyright
#	new file:   debian/libx11-6.install
#	new file:   debian/libx11-6.postinst.in
#	new file:   debian/libx11-6.preinst.in
#	new file:   debian/libx11-data.install
#	new file:   debian/libx11-dev.install
#	new file:   debian/patches/001_no_xkb_in_pc_file.diff
#	new file:   debian/patches/002_arm_abi_brain_damage.diff
#	new file:   debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
#	new file:   debian/patches/004_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff
#	new file:   debian/patches/005_Compose_fix_latin1_UTF8.diff
#	new file:   debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
#	new file:   debian/patches/007_iso8859-15_Compose_fix.diff
#	new file:   debian/patches/008_remove_ko_Compose.diff
#	new file:   debian/patches/009_iso8859-15_Compose_Eurosign.diff
#	new file:   debian/patches/010_manpage_suffixes.diff
#	new file:   debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff
#	new file:   debian/patches/014_add_Khmer_digraphs.diff
#	new file:   debian/patches/015_russian_locale_alias.diff
#	new file:   debian/patches/016_greek_polytonic_Compose.diff
#	new file:   debian/patches/019_new_autoconf.diff
#	new file:   debian/patches/020_CVE-2006-5397.diff
#	new file:   debian/patches/021_compose_fclose.diff
#	new file:   debian/patches/022_CVE-2007-1667.diff
#	new file:   debian/patches/series
#	new file:   debian/rules
#	new file:   debian/xsfbs/xsfbs-autoreconf.mk
#	new file:   debian/xsfbs/xsfbs.mk
#	new file:   debian/xsfbs/xsfbs.sh
#	new file:   depcomp
#	new file:   include/Makefile.in
#	new file:   include/X11/XlibConf.h
#	new file:   install-sh
#	new file:   ltmain.sh
#	renamed:    man/Makefile.am -> man/Makefile.in
#	new file:   missing
#	new file:   mkinstalldirs
#	new file:   modules/Makefile.in
#	new file:   modules/im/Makefile.in
#	new file:   modules/im/ximcp/Makefile.in
#	new file:   modules/lc/Makefile.in
#	new file:   modules/lc/Utf8/Makefile.in
#	new file:   modules/lc/def/Makefile.in
#	new file:   modules/lc/gen/Makefile.in
#	new file:   modules/lc/xlocale/Makefile.in
#	new file:   modules/om/Makefile.in
#	new file:   modules/om/generic/Makefile.in
#	new file:   nls/C/Makefile.in
#	new file:   nls/Makefile.in
#	new file:   nls/armscii-8/Makefile.in
#	new file:   nls/el_GR.UTF-8/Makefile.in
#	new file:   nls/en_US.UTF-8/Makefile.in
#	new file:   nls/georgian-academy/Makefile.in
#	new file:   nls/georgian-ps/Makefile.in
#	new file:   nls/ibm-cp1133/Makefile.in
#	new file:   nls/iscii-dev/Makefile.in
#	new file:   nls/isiri-3342/Makefile.in
#	new file:   nls/iso8859-1/Makefile.in
#	new file:   nls/iso8859-10/Makefile.in
#	new file:   nls/iso8859-11/Makefile.in
#	new file:   nls/iso8859-13/Makefile.in
#	new file:   nls/iso8859-14/Makefile.in
#	new file:   nls/iso8859-15/Makefile.in
#	new file:   nls/iso8859-2/Makefile.in
#	new file:   nls/iso8859-3/Makefile.in
#	new file:   nls/iso8859-4/Makefile.in
#	new file:   nls/iso8859-5/Makefile.in
#	new file:   nls/iso8859-6/Makefile.in
#	new file:   nls/iso8859-7/Makefile.in
#	new file:   nls/iso8859-8/Makefile.in
#	new file:   nls/iso8859-9/Makefile.in
#	new file:   nls/iso8859-9e/Makefile.in
#	new file:   nls/ja.JIS/Makefile.in
#	new file:   nls/ja.S90/Makefile.in
#	new file:   nls/ja.SJIS/Makefile.in
#	new file:   nls/ja.U90/Makefile.in
#	new file:   nls/ja/Makefile.in
#	new file:   nls/ja_JP.UTF-8/Makefile.in
#	new file:   nls/ko/Makefile.in
#	new file:   nls/ko_KR.UTF-8/Makefile.in
#	new file:   nls/koi8-c/Makefile.in
#	new file:   nls/koi8-r/Makefile.in
#	new file:   nls/koi8-u/Makefile.in
#	new file:   nls/microsoft-cp1251/Makefile.in
#	new file:   nls/microsoft-cp1255/Makefile.in
#	new file:   nls/microsoft-cp1256/Makefile.in
#	new file:   nls/mulelao-1/Makefile.in
#	new file:   nls/nokhchi-1/Makefile.in
#	new file:   nls/pt_BR.UTF-8/Makefile.in
#	new file:   nls/ru_RU.UTF-8/Makefile.in
#	new file:   nls/tatar-cyr/Makefile.in
#	new file:   nls/th_TH.UTF-8/Makefile.in
#	new file:   nls/th_TH/Makefile.in
#	new file:   nls/tscii-0/Makefile.in
#	new file:   nls/vi_VN.tcvn/Makefile.in
#	new file:   nls/vi_VN.viscii/Makefile.in
#	new file:   nls/zh_CN.UTF-8/Makefile.in
#	new file:   nls/zh_CN.gb18030/Makefile.in
#	new file:   nls/zh_CN.gbk/Makefile.in
#	new file:   nls/zh_CN/Makefile.in
#	new file:   nls/zh_HK.UTF-8/Makefile.in
#	new file:   nls/zh_HK.big5/Makefile.in
#	new file:   nls/zh_HK.big5hkscs/Makefile.in
#	new file:   nls/zh_TW.UTF-8/Makefile.in
#	new file:   nls/zh_TW.big5/Makefile.in
#	new file:   nls/zh_TW/Makefile.in
#	new file:   src/Makefile.in
#	new file:   src/config.h.in
#	new file:   src/util/Makefile.in
#	new file:   src/xcms/Makefile.in
#	new file:   src/xkb/Makefile.in
#	new file:   src/xlibi18n/Makefile.in
#
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#
#	unmerged:   AUTHORS
#	modified:   AUTHORS
#	unmerged:   Makefile.am
#	modified:   Makefile.am
#	unmerged:   NEWS
#	modified:   NEWS
#	unmerged:   README
#	modified:   README
#	unmerged:   acinclude.m4
#	modified:   acinclude.m4
#	unmerged:   configure.ac
#	modified:   configure.ac
#	unmerged:   cpprules.in
#	modified:   cpprules.in
#	unmerged:   include/Makefile.am
#	modified:   include/Makefile.am
#	unmerged:   include/X11/Xlibint.h
#	modified:   include/X11/Xlibint.h
#	unmerged:   man/AllPlanes.man
#	modified:   man/AllPlanes.man
#	unmerged:   man/BlackPixelOfScreen.man
#	modified:   man/BlackPixelOfScreen.man
#	unmerged:   man/DisplayOfCCC.man
#	modified:   man/DisplayOfCCC.man
#	unmerged:   man/ImageByteOrder.man
#	modified:   man/ImageByteOrder.man
#	unmerged:   man/IsCursorKey.man
#	modified:   man/IsCursorKey.man
#	unmerged:   man/Makefile.am
#	modified:   man/Makefile.am
#	unmerged:   man/XAddConnectionWatch.man
#	modified:   man/XAddConnectionWatch.man
#	unmerged:   man/XAddHost.man
#	modified:   man/XAddHost.man
#	unmerged:   man/XAllocClassHint.man
#	modified:   man/XAllocClassHint.man
#	unmerged:   man/XAllocColor.man
#	modified:   man/XAllocColor.man
#	unmerged:   man/XAllocIconSize.man
#	modified:   man/XAllocIconSize.man
#	unmerged:   man/XAllocSizeHints.man
#	modified:   man/XAllocSizeHints.man
#	unmerged:   man/XAllocStandardColormap.man
#	modified:   man/XAllocStandardColormap.man
#	unmerged:   man/XAllocWMHints.man
#	modified:   man/XAllocWMHints.man
#	unmerged:   man/XAllowEvents.man
#	modified:   man/XAllowEvents.man
#	unmerged:   man/XAnyEvent.man
#	modified:   man/XAnyEvent.man
#	unmerged:   man/XButtonEvent.man
#	modified:   man/XButtonEvent.man
#	unmerged:   man/XChangeKeyboardControl.man
#	modified:   man/XChangeKeyboardControl.man
#	unmerged:   man/XChangeKeyboardMapping.man
#	modified:   man/XChangeKeyboardMapping.man
#	unmerged:   man/XChangePointerControl.man
#	modified:   man/XChangePointerControl.man
#	unmerged:   man/XChangeSaveSet.man
#	modified:   man/XChangeSaveSet.man
#	unmerged:   man/XChangeWindowAttributes.man
#	modified:   man/XChangeWindowAttributes.man
#	unmerged:   man/XCirculateEvent.man
#	modified:   man/XCirculateEvent.man
#	unmerged:   man/XCirculateRequestEvent.man
#	modified:   man/XCirculateRequestEvent.man
#	unmerged:   man/XClearArea.man
#	modified:   man/XClearArea.man
#	unmerged:   man/XClientMessageEvent.man
#	modified:   man/XClientMessageEvent.man
#	unmerged:   man/XColormapEvent.man
#	modified:   man/XColormapEvent.man
#	unmerged:   man/XConfigureEvent.man
#	modified:   man/XConfigureEvent.man
#	unmerged:   man/XConfigureRequestEvent.man
#	modified:   man/XConfigureRequestEvent.man
#	unmerged:   man/XConfigureWindow.man
#	modified:   man/XConfigureWindow.man
#	unmerged:   man/XCopyArea.man
#	modified:   man/XCopyArea.man
#	unmerged:   man/XCreateColormap.man
#	modified:   man/XCreateColormap.man
#	unmerged:   man/XCreateFontCursor.man
#	modified:   man/XCreateFontCursor.man
#	unmerged:   man/XCreateFontSet.man
#	modified:   man/XCreateFontSet.man
#	unmerged:   man/XCreateGC.man
#	modified:   man/XCreateGC.man
#	unmerged:   man/XCreateIC.man
#	modified:   man/XCreateIC.man
#	unmerged:   man/XCreateOC.man
#	modified:   man/XCreateOC.man
#	unmerged:   man/XCreatePixmap.man
#	modified:   man/XCreatePixmap.man
#	unmerged:   man/XCreateRegion.man
#	modified:   man/XCreateRegion.man
#	unmerged:   man/XCreateWindow.man
#	modified:   man/XCreateWindow.man
#	unmerged:   man/XCreateWindowEvent.man
#	modified:   man/XCreateWindowEvent.man
#	unmerged:   man/XCrossingEvent.man
#	modified:   man/XCrossingEvent.man
#	unmerged:   man/XDefineCursor.man
#	modified:   man/XDefineCursor.man
#	unmerged:   man/XDestroyWindow.man
#	modified:   man/XDestroyWindow.man
#	unmerged:   man/XDestroyWindowEvent.man
#	modified:   man/XDestroyWindowEvent.man
#	unmerged:   man/XDrawArc.man
#	modified:   man/XDrawArc.man
#	unmerged:   man/XDrawImageString.man
#	modified:   man/XDrawImageString.man
#	unmerged:   man/XDrawLine.man
#	modified:   man/XDrawLine.man
#	unmerged:   man/XDrawPoint.man
#	modified:   man/XDrawPoint.man
#	unmerged:   man/XDrawRectangle.man
#	modified:   man/XDrawRectangle.man
#	unmerged:   man/XDrawString.man
#	modified:   man/XDrawString.man
#	unmerged:   man/XDrawText.man
#	modified:   man/XDrawText.man
#	unmerged:   man/XEmptyRegion.man
#	modified:   man/XEmptyRegion.man
#	unmerged:   man/XErrorEvent.man
#	modified:   man/XErrorEvent.man
#	unmerged:   man/XExposeEvent.man
#	modified:   man/XExposeEvent.man
#	unmerged:   man/XExtentsOfFontSet.man
#	modified:   man/XExtentsOfFontSet.man
#	unmerged:   man/XFillRectangle.man
#	modified:   man/XFillRectangle.man
#	unmerged:   man/XFilterEvent.man
#	modified:   man/XFilterEvent.man
#	unmerged:   man/XFlush.man
#	modified:   man/XFlush.man
#	unmerged:   man/XFocusChangeEvent.man
#	modified:   man/XFocusChangeEvent.man
#	unmerged:   man/XFontSetExtents.man
#	modified:   man/XFontSetExtents.man
#	unmerged:   man/XFontsOfFontSet.man
#	modified:   man/XFontsOfFontSet.man
#	unmerged:   man/XFree.man
#	modified:   man/XFree.man
#	unmerged:   man/XGetVisualInfo.man
#	modified:   man/XGetVisualInfo.man
#	unmerged:   man/XGetWindowAttributes.man
#	modified:   man/XGetWindowAttributes.man
#	unmerged:   man/XGetWindowProperty.man
#	modified:   man/XGetWindowProperty.man
#	unmerged:   man/XGrabButton.man
#	modified:   man/XGrabButton.man
#	unmerged:   man/XGrabKey.man
#	modified:   man/XGrabKey.man
#	unmerged:   man/XGrabKeyboard.man
#	modified:   man/XGrabKeyboard.man
#	unmerged:   man/XGrabPointer.man
#	modified:   man/XGrabPointer.man
#	unmerged:   man/XGrabServer.man
#	modified:   man/XGrabServer.man
#	unmerged:   man/XGraphicsExposeEvent.man
#	modified:   man/XGraphicsExposeEvent.man
#	unmerged:   man/XGravityEvent.man
#	modified:   man/XGravityEvent.man
#	unmerged:   man/XIconifyWindow.man
#	modified:   man/XIconifyWindow.man
#	unmerged:   man/XIfEvent.man
#	modified:   man/XIfEvent.man
#	unmerged:   man/XInitImage.man
#	modified:   man/XInitImage.man
#	unmerged:   man/XInitThreads.man
#	modified:   man/XInitThreads.man
#	unmerged:   man/XInstallColormap.man
#	modified:   man/XInstallColormap.man
#	unmerged:   man/XInternAtom.man
#	modified:   man/XInternAtom.man
#	unmerged:   man/XIntersectRegion.man
#	modified:   man/XIntersectRegion.man
#	unmerged:   man/XKeymapEvent.man
#	modified:   man/XKeymapEvent.man
#	unmerged:   man/XListFonts.man
#	modified:   man/XListFonts.man
#	unmerged:   man/XLoadFont.man
#	modified:   man/XLoadFont.man
#	unmerged:   man/XLookupKeysym.man
#	modified:   man/XLookupKeysym.man
#	unmerged:   man/XMapEvent.man
#	modified:   man/XMapEvent.man
#	unmerged:   man/XMapRequestEvent.man
#	modified:   man/XMapRequestEvent.man
#	unmerged:   man/XMapWindow.man
#	modified:   man/XMapWindow.man
#	unmerged:   man/XNextEvent.man
#	modified:   man/XNextEvent.man
#	unmerged:   man/XNoOp.man
#	modified:   man/XNoOp.man
#	unmerged:   man/XOpenDisplay.man
#	modified:   man/XOpenDisplay.man
#	unmerged:   man/XOpenIM.man
#	modified:   man/XOpenIM.man
#	unmerged:   man/XOpenOM.man
#	modified:   man/XOpenOM.man
#	unmerged:   man/XParseGeometry.man
#	modified:   man/XParseGeometry.man
#	unmerged:   man/XPolygonRegion.man
#	modified:   man/XPolygonRegion.man
#	unmerged:   man/XPropertyEvent.man
#	modified:   man/XPropertyEvent.man
#	unmerged:   man/XPutBackEvent.man
#	modified:   man/XPutBackEvent.man
#	unmerged:   man/XPutImage.man
#	modified:   man/XPutImage.man
#	unmerged:   man/XQueryBestSize.man
#	modified:   man/XQueryBestSize.man
#	unmerged:   man/XQueryColor.man
#	modified:   man/XQueryColor.man
#	unmerged:   man/XQueryExtension.man
#	modified:   man/XQueryExtension.man
#	unmerged:   man/XQueryPointer.man
#	modified:   man/XQueryPointer.man
#	unmerged:   man/XQueryTree.man
#	modified:   man/XQueryTree.man
#	unmerged:   man/XRaiseWindow.man
#	modified:   man/XRaiseWindow.man
#	unmerged:   man/XReadBitmapFile.man
#	modified:   man/XReadBitmapFile.man
#	unmerged:   man/XRecolorCursor.man
#	modified:   man/XRecolorCursor.man
#	unmerged:   man/XReparentEvent.man
#	modified:   man/XReparentEvent.man
#	unmerged:   man/XReparentWindow.man
#	modified:   man/XReparentWindow.man
#	unmerged:   man/XResizeRequestEvent.man
#	modified:   man/XResizeRequestEvent.man
#	unmerged:   man/XResourceManagerString.man
#	modified:   man/XResourceManagerString.man
#	unmerged:   man/XSaveContext.man
#	modified:   man/XSaveContext.man
#	unmerged:   man/XSelectInput.man
#	modified:   man/XSelectInput.man
#	unmerged:   man/XSelectionClearEvent.man
#	modified:   man/XSelectionClearEvent.man
#	unmerged:   man/XSelectionEvent.man
#	modified:   man/XSelectionEvent.man
#	unmerged:   man/XSelectionRequestEvent.man
#	modified:   man/XSelectionRequestEvent.man
#	unmerged:   man/XSendEvent.man
#	modified:   man/XSendEvent.man
#	unmerged:   man/XSetArcMode.man
#	modified:   man/XSetArcMode.man
#	unmerged:   man/XSetClipOrigin.man
#	modified:   man/XSetClipOrigin.man
#	unmerged:   man/XSetCloseDownMode.man
#	modified:   man/XSetCloseDownMode.man
#	unmerged:   man/XSetCommand.man
#	modified:   man/XSetCommand.man
#	unmerged:   man/XSetErrorHandler.man
#	modified:   man/XSetErrorHandler.man
#	unmerged:   man/XSetFillStyle.man
#	modified:   man/XSetFillStyle.man
#	unmerged:   man/XSetFont.man
#	modified:   man/XSetFont.man
#	unmerged:   man/XSetFontPath.man
#	modified:   man/XSetFontPath.man
#	unmerged:   man/XSetICFocus.man
#	modified:   man/XSetICFocus.man
#	unmerged:   man/XSetICValues.man
#	modified:   man/XSetICValues.man
#	unmerged:   man/XSetInputFocus.man
#	modified:   man/XSetInputFocus.man
#	unmerged:   man/XSetLineAttributes.man
#	modified:   man/XSetLineAttributes.man
#	unmerged:   man/XSetPointerMapping.man
#	modified:   man/XSetPointerMapping.man
#	unmerged:   man/XSetScreenSaver.man
#	modified:   man/XSetScreenSaver.man
#	unmerged:   man/XSetSelectionOwner.man
#	modified:   man/XSetSelectionOwner.man
#	unmerged:   man/XSetState.man
#	modified:   man/XSetState.man
#	unmerged:   man/XSetTextProperty.man
#	modified:   man/XSetTextProperty.man
#	unmerged:   man/XSetTile.man
#	modified:   man/XSetTile.man
#	unmerged:   man/XSetTransientForHint.man
#	modified:   man/XSetTransientForHint.man
#	unmerged:   man/XSetWMClientMachine.man
#	modified:   man/XSetWMClientMachine.man
#	unmerged:   man/XSetWMColormapWindows.man
#	modified:   man/XSetWMColormapWindows.man
#	unmerged:   man/XSetWMIconName.man
#	modified:   man/XSetWMIconName.man
#	unmerged:   man/XSetWMName.man
#	modified:   man/XSetWMName.man
#	unmerged:   man/XSetWMProperties.man
#	modified:   man/XSetWMProperties.man
#	unmerged:   man/XSetWMProtocols.man
#	modified:   man/XSetWMProtocols.man
#	unmerged:   man/XStoreBytes.man
#	modified:   man/XStoreBytes.man
#	unmerged:   man/XStoreColors.man
#	modified:   man/XStoreColors.man
#	unmerged:   man/XStringListToTextProperty.man
#	modified:   man/XStringListToTextProperty.man
#	unmerged:   man/XStringToKeysym.man
#	modified:   man/XStringToKeysym.man
#	unmerged:   man/XSupportsLocale.man
#	modified:   man/XSupportsLocale.man
#	unmerged:   man/XSynchronize.man
#	modified:   man/XSynchronize.man
#	unmerged:   man/XTextExtents.man
#	modified:   man/XTextExtents.man
#	unmerged:   man/XTextWidth.man
#	modified:   man/XTextWidth.man
#	unmerged:   man/XTranslateCoordinates.man
#	modified:   man/XTranslateCoordinates.man
#	unmerged:   man/XUnmapEvent.man
#	modified:   man/XUnmapEvent.man
#	unmerged:   man/XUnmapWindow.man
#	modified:   man/XUnmapWindow.man
#	unmerged:   man/XVaCreateNestedList.man
#	modified:   man/XVaCreateNestedList.man
#	unmerged:   man/XVisibilityEvent.man
#	modified:   man/XVisibilityEvent.man
#	unmerged:   man/XWarpPointer.man
#	modified:   man/XWarpPointer.man
#	unmerged:   man/XcmsAllocColor.man
#	modified:   man/XcmsAllocColor.man
#	unmerged:   man/XcmsCCCOfColormap.man
#	modified:   man/XcmsCCCOfColormap.man
#	unmerged:   man/XcmsCIELabQueryMaxC.man
#	modified:   man/XcmsCIELabQueryMaxC.man
#	unmerged:   man/XcmsCIELuvQueryMaxC.man
#	modified:   man/XcmsCIELuvQueryMaxC.man
#	unmerged:   man/XcmsColor.man
#	modified:   man/XcmsColor.man
#	unmerged:   man/XcmsConvertColors.man
#	modified:   man/XcmsConvertColors.man
#	unmerged:   man/XcmsCreateCCC.man
#	modified:   man/XcmsCreateCCC.man
#	unmerged:   man/XcmsDefaultCCC.man
#	modified:   man/XcmsDefaultCCC.man
#	unmerged:   man/XcmsQueryBlack.man
#	modified:   man/XcmsQueryBlack.man
#	unmerged:   man/XcmsQueryColor.man
#	modified:   man/XcmsQueryColor.man
#	unmerged:   man/XcmsSetWhitePoint.man
#	modified:   man/XcmsSetWhitePoint.man
#	unmerged:   man/XcmsStoreColor.man
#	modified:   man/XcmsStoreColor.man
#	unmerged:   man/XcmsTekHVCQueryMaxC.man
#	modified:   man/XcmsTekHVCQueryMaxC.man
#	unmerged:   man/XmbDrawImageString.man
#	modified:   man/XmbDrawImageString.man
#	unmerged:   man/XmbDrawString.man
#	modified:   man/XmbDrawString.man
#	unmerged:   man/XmbDrawText.man
#	modified:   man/XmbDrawText.man
#	unmerged:   man/XmbLookupString.man
#	modified:   man/XmbLookupString.man
#	unmerged:   man/XmbResetIC.man
#	modified:   man/XmbResetIC.man
#	unmerged:   man/XmbTextEscapement.man
#	modified:   man/XmbTextEscapement.man
#	unmerged:   man/XmbTextExtents.man
#	modified:   man/XmbTextExtents.man
#	unmerged:   man/XmbTextListToTextProperty.man
#	modified:   man/XmbTextListToTextProperty.man
#	unmerged:   man/XmbTextPerCharExtents.man
#	modified:   man/XmbTextPerCharExtents.man
#	unmerged:   man/XrmEnumerateDatabase.man
#	modified:   man/XrmEnumerateDatabase.man
#	unmerged:   man/XrmGetFileDatabase.man
#	modified:   man/XrmGetFileDatabase.man
#	unmerged:   man/XrmGetResource.man
#	modified:   man/XrmGetResource.man
#	unmerged:   man/XrmInitialize.man
#	modified:   man/XrmInitialize.man
#	unmerged:   man/XrmMergeDatabases.man
#	modified:   man/XrmMergeDatabases.man
#	unmerged:   man/XrmPutResource.man
#	modified:   man/XrmPutResource.man
#	unmerged:   man/XrmUniqueQuark.man
#	modified:   man/XrmUniqueQuark.man
#	unmerged:   modules/im/ximcp/imDefIm.c
#	modified:   modules/im/ximcp/imDefIm.c
#	unmerged:   modules/im/ximcp/imDefLkup.c
#	modified:   modules/im/ximcp/imDefLkup.c
#	unmerged:   modules/im/ximcp/imExten.c
#	modified:   modules/im/ximcp/imExten.c
#	unmerged:   modules/im/ximcp/imInt.c
#	modified:   modules/im/ximcp/imInt.c
#	unmerged:   modules/im/ximcp/imLcIm.c
#	modified:   modules/im/ximcp/imLcIm.c
#	unmerged:   modules/im/ximcp/imLcPrs.c
#	modified:   modules/im/ximcp/imLcPrs.c
#	unmerged:   modules/im/ximcp/imRm.c
#	modified:   modules/im/ximcp/imRm.c
#	unmerged:   modules/im/ximcp/imTrX.c
#	modified:   modules/im/ximcp/imTrX.c
#	unmerged:   modules/lc/gen/lcGenConv.c
#	modified:   modules/lc/gen/lcGenConv.c
#	unmerged:   modules/om/generic/omGeneric.c
#	modified:   modules/om/generic/omGeneric.c
#	unmerged:   modules/om/generic/omXChar.c
#	modified:   modules/om/generic/omXChar.c
#	unmerged:   nls/Makefile.am
#	modified:   nls/Makefile.am
#	unmerged:   nls/compose.dir.pre
#	modified:   nls/compose.dir.pre
#	unmerged:   nls/el_GR.UTF-8/Compose.pre
#	modified:   nls/el_GR.UTF-8/Compose.pre
#	unmerged:   nls/en_US.UTF-8/Compose.pre
#	modified:   nls/en_US.UTF-8/Compose.pre
#	unmerged:   nls/en_US.UTF-8/XI18N_OBJS
#	modified:   nls/en_US.UTF-8/XI18N_OBJS
#	unmerged:   nls/iso8859-13/Compose.pre
#	modified:   nls/iso8859-13/Compose.pre
#	unmerged:   nls/iso8859-14/Compose.pre
#	modified:   nls/iso8859-14/Compose.pre
#	unmerged:   nls/iso8859-15/Compose.pre
#	modified:   nls/iso8859-15/Compose.pre
#	unmerged:   nls/iso8859-2/Compose.pre
#	modified:   nls/iso8859-2/Compose.pre
#	unmerged:   nls/iso8859-3/Compose.pre
#	modified:   nls/iso8859-3/Compose.pre
#	unmerged:   nls/iso8859-4/Compose.pre
#	modified:   nls/iso8859-4/Compose.pre
#	unmerged:   nls/iso8859-7/Compose.pre
#	modified:   nls/iso8859-7/Compose.pre
#	unmerged:   nls/iso8859-9/Compose.pre
#	modified:   nls/iso8859-9/Compose.pre
#	unmerged:   nls/iso8859-9e/Compose.pre
#	modified:   nls/iso8859-9e/Compose.pre
#	unmerged:   nls/locale.alias.pre
#	modified:   nls/locale.alias.pre
#	unmerged:   nls/locale.dir.pre
#	modified:   nls/locale.dir.pre
#	unmerged:   nls/pt_BR.UTF-8/Compose.pre
#	modified:   nls/pt_BR.UTF-8/Compose.pre
#	unmerged:   nls/vi_VN.tcvn/Compose.pre
#	modified:   nls/vi_VN.tcvn/Compose.pre
#	unmerged:   nls/vi_VN.viscii/Compose.pre
#	modified:   nls/vi_VN.viscii/Compose.pre
#	unmerged:   src/AllCells.c
#	modified:   src/AllCells.c
#	unmerged:   src/AllPlanes.c
#	modified:   src/AllPlanes.c
#	unmerged:   src/AllowEv.c
#	modified:   src/AllowEv.c
#	unmerged:   src/AutoRep.c
#	modified:   src/AutoRep.c
#	unmerged:   src/Backgnd.c
#	modified:   src/Backgnd.c
#	unmerged:   src/BdrWidth.c
#	modified:   src/BdrWidth.c
#	unmerged:   src/Bell.c
#	modified:   src/Bell.c
#	unmerged:   src/Border.c
#	modified:   src/Border.c
#	unmerged:   src/ChAccCon.c
#	modified:   src/ChAccCon.c
#	unmerged:   src/ChActPGb.c
#	modified:   src/ChActPGb.c
#	unmerged:   src/ChClMode.c
#	modified:   src/ChClMode.c
#	unmerged:   src/ChCmap.c
#	modified:   src/ChCmap.c
#	unmerged:   src/ChGC.c
#	modified:   src/ChGC.c
#	unmerged:   src/ChKeyCon.c
#	modified:   src/ChKeyCon.c
#	unmerged:   src/ChPntCon.c
#	modified:   src/ChPntCon.c
#	unmerged:   src/ChSaveSet.c
#	modified:   src/ChSaveSet.c
#	unmerged:   src/ChWAttrs.c
#	modified:   src/ChWAttrs.c
#	unmerged:   src/ChWindow.c
#	modified:   src/ChWindow.c
#	unmerged:   src/ChkIfEv.c
#	modified:   src/ChkIfEv.c
#	unmerged:   src/ChkMaskEv.c
#	modified:   src/ChkMaskEv.c
#	unmerged:   src/ChkTypEv.c
#	modified:   src/ChkTypEv.c
#	unmerged:   src/ChkTypWEv.c
#	modified:   src/ChkTypWEv.c
#	unmerged:   src/ChkWinEv.c
#	modified:   src/ChkWinEv.c
#	unmerged:   src/CirWin.c
#	modified:   src/CirWin.c
#	unmerged:   src/CirWinDn.c
#	modified:   src/CirWinDn.c
#	unmerged:   src/CirWinUp.c
#	modified:   src/CirWinUp.c
#	unmerged:   src/ClDisplay.c
#	modified:   src/ClDisplay.c
#	unmerged:   src/Clear.c
#	modified:   src/Clear.c
#	unmerged:   src/ClearArea.c
#	modified:   src/ClearArea.c
#	unmerged:   src/ConfWind.c
#	modified:   src/ConfWind.c
#	unmerged:   src/ConnDis.c
#	modified:   src/ConnDis.c
#	unmerged:   src/ConvSel.c
#	modified:   src/ConvSel.c
#	unmerged:   src/CopyArea.c
#	modified:   src/CopyArea.c
#	unmerged:   src/CopyCmap.c
#	modified:   src/CopyCmap.c
#	unmerged:   src/CopyGC.c
#	modified:   src/CopyGC.c
#	unmerged:   src/CopyPlane.c
#	modified:   src/CopyPlane.c
#	unmerged:   src/CrCmap.c
#	modified:   src/CrCmap.c
#	unmerged:   src/CrCursor.c
#	modified:   src/CrCursor.c
#	unmerged:   src/CrGC.c
#	modified:   src/CrGC.c
#	unmerged:   src/CrGlCur.c
#	modified:   src/CrGlCur.c
#	unmerged:   src/CrPFBData.c
#	modified:   src/CrPFBData.c
#	unmerged:   src/CrPixmap.c
#	modified:   src/CrPixmap.c
#	unmerged:   src/CrWindow.c
#	modified:   src/CrWindow.c
#	unmerged:   src/Cursor.c
#	modified:   src/Cursor.c
#	unmerged:   src/DefCursor.c
#	modified:   src/DefCursor.c
#	unmerged:   src/DelProp.c
#	modified:   src/DelProp.c
#	unmerged:   src/Depths.c
#	modified:   src/Depths.c
#	unmerged:   src/DestSubs.c
#	modified:   src/DestSubs.c
#	unmerged:   src/DestWind.c
#	modified:   src/DestWind.c
#	unmerged:   src/DrArc.c
#	modified:   src/DrArc.c
#	unmerged:   src/DrArcs.c
#	modified:   src/DrArcs.c
#	unmerged:   src/DrLine.c
#	modified:   src/DrLine.c
#	unmerged:   src/DrLines.c
#	modified:   src/DrLines.c
#	unmerged:   src/DrPoint.c
#	modified:   src/DrPoint.c
#	unmerged:   src/DrPoints.c
#	modified:   src/DrPoints.c
#	unmerged:   src/DrRect.c
#	modified:   src/DrRect.c
#	unmerged:   src/DrRects.c
#	modified:   src/DrRects.c
#	unmerged:   src/DrSegs.c
#	modified:   src/DrSegs.c
#	unmerged:   src/ErrDes.c
#	modified:   src/ErrDes.c
#	unmerged:   src/FSSaver.c
#	modified:   src/FSSaver.c
#	unmerged:   src/FSWrap.c
#	modified:   src/FSWrap.c
#	unmerged:   src/FetchName.c
#	modified:   src/FetchName.c
#	unmerged:   src/FillArc.c
#	modified:   src/FillArc.c
#	unmerged:   src/FillArcs.c
#	modified:   src/FillArcs.c
#	unmerged:   src/FillPoly.c
#	modified:   src/FillPoly.c
#	unmerged:   src/FillRct.c
#	modified:   src/FillRct.c
#	unmerged:   src/FillRcts.c
#	modified:   src/FillRcts.c
#	unmerged:   src/FilterEv.c
#	modified:   src/FilterEv.c
#	unmerged:   src/Flush.c
#	modified:   src/Flush.c
#	unmerged:   src/Font.c
#	modified:   src/Font.c
#	unmerged:   src/FontInfo.c
#	modified:   src/FontInfo.c
#	unmerged:   src/FontNames.c
#	modified:   src/FontNames.c
#	unmerged:   src/FreeCmap.c
#	modified:   src/FreeCmap.c
#	unmerged:   src/FreeCols.c
#	modified:   src/FreeCols.c
#	unmerged:   src/FreeCurs.c
#	modified:   src/FreeCurs.c
#	unmerged:   src/FreeEData.c
#	modified:   src/FreeEData.c
#	unmerged:   src/FreeGC.c
#	modified:   src/FreeGC.c
#	unmerged:   src/FreePix.c
#	modified:   src/FreePix.c
#	unmerged:   src/GCMisc.c
#	modified:   src/GCMisc.c
#	unmerged:   src/GetAtomNm.c
#	modified:   src/GetAtomNm.c
#	unmerged:   src/GetColor.c
#	modified:   src/GetColor.c
#	unmerged:   src/GetDflt.c
#	modified:   src/GetDflt.c
#	unmerged:   src/GetFPath.c
#	modified:   src/GetFPath.c
#	unmerged:   src/GetFProp.c
#	modified:   src/GetFProp.c
#	unmerged:   src/GetGCVals.c
#	modified:   src/GetGCVals.c
#	unmerged:   src/GetGeom.c
#	modified:   src/GetGeom.c
#	unmerged:   src/GetHColor.c
#	modified:   src/GetHColor.c
#	unmerged:   src/GetHints.c
#	modified:   src/GetHints.c
#	unmerged:   src/GetIFocus.c
#	modified:   src/GetIFocus.c
#	unmerged:   src/GetImage.c
#	modified:   src/GetImage.c
#	unmerged:   src/GetKCnt.c
#	modified:   src/GetKCnt.c
#	unmerged:   src/GetMoEv.c
#	modified:   src/GetMoEv.c
#	unmerged:   src/GetNrmHint.c
#	modified:   src/GetNrmHint.c
#	unmerged:   src/GetPCnt.c
#	modified:   src/GetPCnt.c
#	unmerged:   src/GetPntMap.c
#	modified:   src/GetPntMap.c
#	unmerged:   src/GetProp.c
#	modified:   src/GetProp.c
#	unmerged:   src/GetRGBCMap.c
#	modified:   src/GetRGBCMap.c
#	unmerged:   src/GetSOwner.c
#	modified:   src/GetSOwner.c
#	unmerged:   src/GetSSaver.c
#	modified:   src/GetSSaver.c
#	unmerged:   src/GetStCmap.c
#	modified:   src/GetStCmap.c
#	unmerged:   src/GetTxtProp.c
#	modified:   src/GetTxtProp.c
#	unmerged:   src/GetWMCMapW.c
#	modified:   src/GetWMCMapW.c
#	unmerged:   src/GetWMProto.c
#	modified:   src/GetWMProto.c
#	unmerged:   src/GrButton.c
#	modified:   src/GrButton.c
#	unmerged:   src/GrKey.c
#	modified:   src/GrKey.c
#	unmerged:   src/GrKeybd.c
#	modified:   src/GrKeybd.c
#	unmerged:   src/GrPointer.c
#	modified:   src/GrPointer.c
#	unmerged:   src/GrServer.c
#	modified:   src/GrServer.c
#	unmerged:   src/Iconify.c
#	modified:   src/Iconify.c
#	unmerged:   src/IfEvent.c
#	modified:   src/IfEvent.c
#	unmerged:   src/ImUtil.c
#	modified:   src/ImUtil.c
#	unmerged:   src/InitExt.c
#	modified:   src/InitExt.c
#	unmerged:   src/InsCmap.c
#	modified:   src/InsCmap.c
#	unmerged:   src/IntAtom.c
#	modified:   src/IntAtom.c
#	unmerged:   src/KeyBind.c
#	modified:   src/KeyBind.c
#	unmerged:   src/KeysymStr.c
#	modified:   src/KeysymStr.c
#	unmerged:   src/KillCl.c
#	modified:   src/KillCl.c
#	unmerged:   src/LiHosts.c
#	modified:   src/LiHosts.c
#	unmerged:   src/LiICmaps.c
#	modified:   src/LiICmaps.c
#	unmerged:   src/LiProps.c
#	modified:   src/LiProps.c
#	unmerged:   src/ListExt.c
#	modified:   src/ListExt.c
#	unmerged:   src/LookupCol.c
#	modified:   src/LookupCol.c
#	unmerged:   src/LowerWin.c
#	modified:   src/LowerWin.c
#	unmerged:   src/Macros.c
#	modified:   src/Macros.c
#	unmerged:   src/Makefile.am
#	modified:   src/Makefile.am
#	unmerged:   src/MapRaised.c
#	modified:   src/MapRaised.c
#	unmerged:   src/MapSubs.c
#	modified:   src/MapSubs.c
#	unmerged:   src/MapWindow.c
#	modified:   src/MapWindow.c
#	unmerged:   src/MaskEvent.c
#	modified:   src/MaskEvent.c
#	unmerged:   src/Misc.c
#	modified:   src/Misc.c
#	unmerged:   src/ModMap.c
#	modified:   src/ModMap.c
#	unmerged:   src/MoveWin.c
#	modified:   src/MoveWin.c
#	unmerged:   src/NextEvent.c
#	modified:   src/NextEvent.c
#	unmerged:   src/OCWrap.c
#	modified:   src/OCWrap.c
#	unmerged:   src/OMWrap.c
#	modified:   src/OMWrap.c
#	unmerged:   src/OpenDis.c
#	modified:   src/OpenDis.c
#	unmerged:   src/ParseCmd.c
#	modified:   src/ParseCmd.c
#	unmerged:   src/ParseCol.c
#	modified:   src/ParseCol.c
#	unmerged:   src/PeekEvent.c
#	modified:   src/PeekEvent.c
#	unmerged:   src/PeekIfEv.c
#	modified:   src/PeekIfEv.c
#	unmerged:   src/Pending.c
#	modified:   src/Pending.c
#	unmerged:   src/PixFormats.c
#	modified:   src/PixFormats.c
#	unmerged:   src/PmapBgnd.c
#	modified:   src/PmapBgnd.c
#	unmerged:   src/PmapBord.c
#	modified:   src/PmapBord.c
#	unmerged:   src/PolyReg.c
#	modified:   src/PolyReg.c
#	unmerged:   src/PolyTxt.c
#	modified:   src/PolyTxt.c
#	unmerged:   src/PolyTxt16.c
#	modified:   src/PolyTxt16.c
#	unmerged:   src/PropAlloc.c
#	modified:   src/PropAlloc.c
#	unmerged:   src/PutImage.c
#	modified:   src/PutImage.c
#	unmerged:   src/QuBest.c
#	modified:   src/QuBest.c
#	unmerged:   src/QuColor.c
#	modified:   src/QuColor.c
#	unmerged:   src/QuColors.c
#	modified:   src/QuColors.c
#	unmerged:   src/QuCurShp.c
#	modified:   src/QuCurShp.c
#	unmerged:   src/QuKeybd.c
#	modified:   src/QuKeybd.c
#	unmerged:   src/QuPntr.c
#	modified:   src/QuPntr.c
#	unmerged:   src/QuStipShp.c
#	modified:   src/QuStipShp.c
#	unmerged:   src/QuTileShp.c
#	modified:   src/QuTileShp.c
#	unmerged:   src/QuTree.c
#	modified:   src/QuTree.c
#	unmerged:   src/Quarks.c
#	modified:   src/Quarks.c
#	unmerged:   src/RaiseWin.c
#	modified:   src/RaiseWin.c
#	unmerged:   src/RdBitF.c
#	modified:   src/RdBitF.c
#	unmerged:   src/RecolorC.c
#	modified:   src/RecolorC.c
#	unmerged:   src/ReconfWM.c
#	modified:   src/ReconfWM.c
#	unmerged:   src/ReconfWin.c
#	modified:   src/ReconfWin.c
#	unmerged:   src/RepWindow.c
#	modified:   src/RepWindow.c
#	unmerged:   src/RestackWs.c
#	modified:   src/RestackWs.c
#	unmerged:   src/RotProp.c
#	modified:   src/RotProp.c
#	unmerged:   src/ScrResStr.c
#	modified:   src/ScrResStr.c
#	unmerged:   src/SelInput.c
#	modified:   src/SelInput.c
#	unmerged:   src/SendEvent.c
#	modified:   src/SendEvent.c
#	unmerged:   src/SetBack.c
#	modified:   src/SetBack.c
#	unmerged:   src/SetCRects.c
#	modified:   src/SetCRects.c
#	unmerged:   src/SetClMask.c
#	modified:   src/SetClMask.c
#	unmerged:   src/SetClOrig.c
#	modified:   src/SetClOrig.c
#	unmerged:   src/SetFPath.c
#	modified:   src/SetFPath.c
#	unmerged:   src/SetFont.c
#	modified:   src/SetFont.c
#	unmerged:   src/SetFore.c
#	modified:   src/SetFore.c
#	unmerged:   src/SetFunc.c
#	modified:   src/SetFunc.c
#	unmerged:   src/SetHints.c
#	modified:   src/SetHints.c
#	unmerged:   src/SetIFocus.c
#	modified:   src/SetIFocus.c
#	unmerged:   src/SetLStyle.c
#	modified:   src/SetLStyle.c
#	unmerged:   src/SetLocale.c
#	modified:   src/SetLocale.c
#	unmerged:   src/SetNrmHint.c
#	modified:   src/SetNrmHint.c
#	unmerged:   src/SetPMask.c
#	modified:   src/SetPMask.c
#	unmerged:   src/SetPntMap.c
#	modified:   src/SetPntMap.c
#	unmerged:   src/SetRGBCMap.c
#	modified:   src/SetRGBCMap.c
#	unmerged:   src/SetSOwner.c
#	modified:   src/SetSOwner.c
#	unmerged:   src/SetSSaver.c
#	modified:   src/SetSSaver.c
#	unmerged:   src/SetStCmap.c
#	modified:   src/SetStCmap.c
#	unmerged:   src/SetState.c
#	modified:   src/SetState.c
#	unmerged:   src/SetStip.c
#	modified:   src/SetStip.c
#	unmerged:   src/SetTSOrig.c
#	modified:   src/SetTSOrig.c
#	unmerged:   src/SetTile.c
#	modified:   src/SetTile.c
#	unmerged:   src/SetTxtProp.c
#	modified:   src/SetTxtProp.c
#	unmerged:   src/SetWMCMapW.c
#	modified:   src/SetWMCMapW.c
#	unmerged:   src/SetWMProto.c
#	modified:   src/SetWMProto.c
#	unmerged:   src/StBytes.c
#	modified:   src/StBytes.c
#	unmerged:   src/StColor.c
#	modified:   src/StColor.c
#	unmerged:   src/StColors.c
#	modified:   src/StColors.c
#	unmerged:   src/StNColor.c
#	modified:   src/StNColor.c
#	unmerged:   src/StrKeysym.c
#	modified:   src/StrKeysym.c
#	unmerged:   src/StrToText.c
#	modified:   src/StrToText.c
#	unmerged:   src/Sync.c
#	modified:   src/Sync.c
#	unmerged:   src/TextToStr.c
#	modified:   src/TextToStr.c
#	unmerged:   src/TrCoords.c
#	modified:   src/TrCoords.c
#	unmerged:   src/UndefCurs.c
#	modified:   src/UndefCurs.c
#	unmerged:   src/UngrabBut.c
#	modified:   src/UngrabBut.c
#	unmerged:   src/UngrabKbd.c
#	modified:   src/UngrabKbd.c
#	unmerged:   src/UngrabKey.c
#	modified:   src/UngrabKey.c
#	unmerged:   src/UngrabPtr.c
#	modified:   src/UngrabPtr.c
#	unmerged:   src/UngrabSvr.c
#	modified:   src/UngrabSvr.c
#	unmerged:   src/UninsCmap.c
#	modified:   src/UninsCmap.c
#	unmerged:   src/UnldFont.c
#	modified:   src/UnldFont.c
#	unmerged:   src/UnmapSubs.c
#	modified:   src/UnmapSubs.c
#	unmerged:   src/UnmapWin.c
#	modified:   src/UnmapWin.c
#	unmerged:   src/VisUtil.c
#	modified:   src/VisUtil.c
#	unmerged:   src/WMProps.c
#	modified:   src/WMProps.c
#	unmerged:   src/WarpPtr.c
#	modified:   src/WarpPtr.c
#	unmerged:   src/WinEvent.c
#	modified:   src/WinEvent.c
#	unmerged:   src/Window.c
#	modified:   src/Window.c
#	unmerged:   src/Withdraw.c
#	modified:   src/Withdraw.c
#	unmerged:   src/WrBitF.c
#	modified:   src/WrBitF.c
#	unmerged:   src/XErrorDB
#	modified:   src/XErrorDB
#	unmerged:   src/XKeysymDB
#	modified:   src/XKeysymDB
#	unmerged:   src/Xintconn.h
#	modified:   src/Xintconn.h
#	unmerged:   src/XlibAsync.c
#	modified:   src/XlibAsync.c
#	unmerged:   src/XlibInt.c
#	modified:   src/XlibInt.c
#	unmerged:   src/Xrm.c
#	modified:   src/Xrm.c
#	unmerged:   src/imConv.c
#	modified:   src/imConv.c
#	unmerged:   src/util/Makefile.am
#	modified:   src/util/Makefile.am
#	unmerged:   src/xcms/AddDIC.c
#	modified:   src/xcms/AddDIC.c
#	unmerged:   src/xcms/AddSF.c
#	modified:   src/xcms/AddSF.c
#	unmerged:   src/xcms/CCC.c
#	modified:   src/xcms/CCC.c
#	unmerged:   src/xcms/CvCols.c
#	modified:   src/xcms/CvCols.c
#	unmerged:   src/xcms/HVC.c
#	modified:   src/xcms/HVC.c
#	unmerged:   src/xcms/HVCGcC.c
#	modified:   src/xcms/HVCGcC.c
#	unmerged:   src/xcms/HVCGcV.c
#	modified:   src/xcms/HVCGcV.c
#	unmerged:   src/xcms/HVCGcVC.c
#	modified:   src/xcms/HVCGcVC.c
#	unmerged:   src/xcms/HVCMnV.c
#	modified:   src/xcms/HVCMnV.c
#	unmerged:   src/xcms/HVCMxC.c
#	modified:   src/xcms/HVCMxC.c
#	unmerged:   src/xcms/HVCMxV.c
#	modified:   src/xcms/HVCMxV.c
#	unmerged:   src/xcms/HVCMxVC.c
#	modified:   src/xcms/HVCMxVC.c
#	unmerged:   src/xcms/HVCMxVs.c
#	modified:   src/xcms/HVCMxVs.c
#	unmerged:   src/xcms/HVCWpAj.c
#	modified:   src/xcms/HVCWpAj.c
#	unmerged:   src/xcms/IdOfPr.c
#	modified:   src/xcms/IdOfPr.c
#	unmerged:   src/xcms/LRGB.c
#	modified:   src/xcms/LRGB.c
#	unmerged:   src/xcms/Lab.c
#	modified:   src/xcms/Lab.c
#	unmerged:   src/xcms/LabGcC.c
#	modified:   src/xcms/LabGcC.c
#	unmerged:   src/xcms/LabGcL.c
#	modified:   src/xcms/LabGcL.c
#	unmerged:   src/xcms/LabGcLC.c
#	modified:   src/xcms/LabGcLC.c
#	unmerged:   src/xcms/LabMnL.c
#	modified:   src/xcms/LabMnL.c
#	unmerged:   src/xcms/LabMxC.c
#	modified:   src/xcms/LabMxC.c
#	unmerged:   src/xcms/LabMxL.c
#	modified:   src/xcms/LabMxL.c
#	unmerged:   src/xcms/LabMxLC.c
#	modified:   src/xcms/LabMxLC.c
#	unmerged:   src/xcms/LabWpAj.c
#	modified:   src/xcms/LabWpAj.c
#	unmerged:   src/xcms/Luv.c
#	modified:   src/xcms/Luv.c
#	unmerged:   src/xcms/LuvGcC.c
#	modified:   src/xcms/LuvGcC.c
#	unmerged:   src/xcms/LuvGcL.c
#	modified:   src/xcms/LuvGcL.c
#	unmerged:   src/xcms/LuvGcLC.c
#	modified:   src/xcms/LuvGcLC.c
#	unmerged:   src/xcms/LuvMnL.c
#	modified:   src/xcms/LuvMnL.c
#	unmerged:   src/xcms/LuvMxC.c
#	modified:   src/xcms/LuvMxC.c
#	unmerged:   src/xcms/LuvMxL.c
#	modified:   src/xcms/LuvMxL.c
#	unmerged:   src/xcms/LuvMxLC.c
#	modified:   src/xcms/LuvMxLC.c
#	unmerged:   src/xcms/LuvWpAj.c
#	modified:   src/xcms/LuvWpAj.c
#	unmerged:   src/xcms/Makefile.am
#	modified:   src/xcms/Makefile.am
#	unmerged:   src/xcms/OfCCC.c
#	modified:   src/xcms/OfCCC.c
#	unmerged:   src/xcms/PrOfId.c
#	modified:   src/xcms/PrOfId.c
#	unmerged:   src/xcms/QBlack.c
#	modified:   src/xcms/QBlack.c
#	unmerged:   src/xcms/QBlue.c
#	modified:   src/xcms/QBlue.c
#	unmerged:   src/xcms/QGreen.c
#	modified:   src/xcms/QGreen.c
#	unmerged:   src/xcms/QRed.c
#	modified:   src/xcms/QRed.c
#	unmerged:   src/xcms/QWhite.c
#	modified:   src/xcms/QWhite.c
#	unmerged:   src/xcms/QuCol.c
#	modified:   src/xcms/QuCol.c
#	unmerged:   src/xcms/QuCols.c
#	modified:   src/xcms/QuCols.c
#	unmerged:   src/xcms/SetCCC.c
#	modified:   src/xcms/SetCCC.c
#	unmerged:   src/xcms/StCol.c
#	modified:   src/xcms/StCol.c
#	unmerged:   src/xcms/StCols.c
#	modified:   src/xcms/StCols.c
#	unmerged:   src/xcms/XYZ.c
#	modified:   src/xcms/XYZ.c
#	unmerged:   src/xcms/cmsAllCol.c
#	modified:   src/xcms/cmsAllCol.c
#	unmerged:   src/xcms/cmsCmap.c
#	modified:   src/xcms/cmsCmap.c
#	unmerged:   src/xcms/cmsColNm.c
#	modified:   src/xcms/cmsColNm.c
#	unmerged:   src/xcms/cmsMath.c
#	modified:   src/xcms/cmsMath.c
#	unmerged:   src/xcms/cmsTrig.c
#	modified:   src/xcms/cmsTrig.c
#	unmerged:   src/xcms/uvY.c
#	modified:   src/xcms/uvY.c
#	unmerged:   src/xcms/xyY.c
#	modified:   src/xcms/xyY.c
#	unmerged:   src/xkb/Makefile.am
#	modified:   src/xkb/Makefile.am
#	unmerged:   src/xkb/XKBCvt.c
#	modified:   src/xkb/XKBCvt.c
#	unmerged:   src/xkb/XKBExtDev.c
#	modified:   src/xkb/XKBExtDev.c
#	unmerged:   src/xkb/XKBGeom.c
#	modified:   src/xkb/XKBGeom.c
#	unmerged:   src/xkb/XKBGetMap.c
#	modified:   src/xkb/XKBGetMap.c
#	unmerged:   src/xkb/XKBRdBuf.c
#	modified:   src/xkb/XKBRdBuf.c
#	unmerged:   src/xkb/XKBSetGeom.c
#	modified:   src/xkb/XKBSetGeom.c
#	unmerged:   src/xkb/XKBleds.c
#	modified:   src/xkb/XKBleds.c
#	unmerged:   src/xkb/XKBlibint.h
#	modified:   src/xkb/XKBlibint.h
#	unmerged:   src/xlibi18n/Makefile.am
#	modified:   src/xlibi18n/Makefile.am
#	unmerged:   src/xlibi18n/XDefaultIMIF.c
#	modified:   src/xlibi18n/XDefaultIMIF.c
#	unmerged:   src/xlibi18n/XimTrInt.h
#	modified:   src/xlibi18n/XimTrInt.h
#	unmerged:   src/xlibi18n/Ximint.h
#	modified:   src/xlibi18n/Ximint.h
#	unmerged:   src/xlibi18n/XlcPubI.h
#	modified:   src/xlibi18n/XlcPubI.h
#	unmerged:   src/xlibi18n/Xlcint.h
#	modified:   src/xlibi18n/Xlcint.h
#	unmerged:   src/xlibi18n/lcCT.c
#	modified:   src/xlibi18n/lcCT.c
#	unmerged:   src/xlibi18n/lcDB.c
#	modified:   src/xlibi18n/lcDB.c
#	unmerged:   src/xlibi18n/lcFile.c
#	modified:   src/xlibi18n/lcFile.c
#	unmerged:   x11.pc.in
#	modified:   x11.pc.in
#
Attempting to address merge issues automatically...
Initialized empty Git repository in /srv/XorgAutoPackage/libx11-FDO-HEAD/.git/
remote: Generating pack...
remote: Done counting 8870 objects.
remote: Deltifying 8870 objects.
remote:    0% (1/8870) done
remote:    1% (89/8870) done
remote:    2% (178/8870) done
remote:    3% (267/8870) done
remote:    4% (355/8870) done
remote:    5% (444/8870) done
remote:    6% (533/8870) done
remote:    7% (621/8870) done
remote:    8% (710/8870) done
remote:    9% (799/8870) done
remote:   10% (887/8870) done
remote:   11% (976/8870) done
remote:   12% (1065/8870) done
remote:   13% (1154/8870) done
remote:   14% (1242/8870) done
remote:   15% (1331/8870) done
remote:   16% (1420/8870) done
remote:   17% (1508/8870) done
remote:   18% (1597/8870) done
remote:   19% (1686/8870) done
remote:   20% (1774/8870) done
remote:   21% (1863/8870) done
remote:   22% (1952/8870) done
remote:   23% (2041/8870) done
remote:   24% (2129/8870) done
remote:   25% (2218/8870) done
remote:   26% (2307/8870) done
remote:   27% (2395/8870) done
remote:   28% (2484/8870) done
remote:   28% (2489/8870) done
remote:   29% (2573/8870) done
remote:   30% (2661/8870) done
remote:   31% (2750/8870) done
remote:   32% (2839/8870) done
remote:   33% (2928/8870) done
remote:   34% (3016/8870) done
remote:   35% (3105/8870) done
remote:   36% (3194/8870) done
remote:   37% (3282/8870) done
remote:   38% (3371/8870) done
remote:   39% (3460/8870) done
remote:   40% (3548/8870) done
remote:   41% (3637/8870) done
remote:   42% (3726/8870) done
remote:   43% (3815/8870) done
remote:   44% (3903/8870) done
remote:   44% (3947/8870) done
remote:   45% (3992/8870) done
remote:   46% (4081/8870) done
remote:   47% (4169/8870) done
remote:   48% (4258/8870) done
remote:   49% (4347/8870) done
remote:   50% (4435/8870) done
remote:   51% (4524/8870) done
remote:   52% (4613/8870) done
remote:   53% (4702/8870) done
remote:   54% (4790/8870) done
remote:   55% (4879/8870) done
remote:   56% (4968/8870) done
remote:   57% (5056/8870) done
remote:   58% (5145/8870) done
remote:   59% (5234/8870) done
remote:   60% (5322/8870) done
remote:   61% (5411/8870) done
remote:   62% (5500/8870) done
remote:   63% (5589/8870) done
remote:   64% (5677/8870) done
remote:   65% (5766/8870) done
remote:   66% (5855/8870) done
remote:   67% (5943/8870) done
remote:   68% (6032/8870) done
remote:   69% (6121/8870) done
remote:   70% (6209/8870) done
remote:   71% (6298/8870) done
remote:   72% (6387/8870) done
remote:   73% (6476/8870) done
remote:   74% (6564/8870) done
remote:   75% (6653/8870) done
remote:   76% (6742/8870) done
remote:   77% (6830/8870) done
remote:   78% (6919/8870) done
remote:   79% (7008/8870) done
remote:   80% (7096/8870) done
remote:   81% (7185/8870) done
remote:   82% (7274/8870) done
remote:   83% (7363/8870) done
remote:   84% (7451/8870) done
remote:   85% (7540/8870) done
remote:   86% (7629/8870) done
remote:   87% (7717/8870) done
remote:   88% (7806/8870) done
remote:   89% (7895/8870) done
remote:   90% (7983/8870) done
remote:   91% (8072/8870) done
remote:   92% (8161/8870) done
remote:   93% (8250/8870) done
remote:   94% (8338/8870) done
remote:   95% (8427/8870) done
remote:   96% (8516/8870) done
remote:   97% (8604/8870) done
remote:   98% (8693/8870) done
remote:   99% (8782/8870) done
remote:  100% (8870/8870) done
remote: 
remote: Total 8870, written 8870 (delta 6819), reused 0 (delta 0)
#	unmerged:   Makefile.am
+ Discarding Debian differences in Makefile.am
AUTHORS: needs merge
NEWS: needs merge
README: needs merge
acinclude.m4: needs merge
configure.ac: needs merge
cpprules.in: needs merge
include/Makefile.am: needs merge
include/X11/Xlibint.h: needs merge
man/AllPlanes.man: needs merge
man/BlackPixelOfScreen.man: needs merge
man/DisplayOfCCC.man: needs merge
man/ImageByteOrder.man: needs merge
man/IsCursorKey.man: needs merge
man/Makefile.am: needs merge
man/XAddConnectionWatch.man: needs merge
man/XAddHost.man: needs merge
man/XAllocClassHint.man: needs merge
man/XAllocColor.man: needs merge
man/XAllocIconSize.man: needs merge
man/XAllocSizeHints.man: needs merge
man/XAllocStandardColormap.man: needs merge
man/XAllocWMHints.man: needs merge
man/XAllowEvents.man: needs merge
man/XAnyEvent.man: needs merge
man/XButtonEvent.man: needs merge
man/XChangeKeyboardControl.man: needs merge
man/XChangeKeyboardMapping.man: needs merge
man/XChangePointerControl.man: needs merge
man/XChangeSaveSet.man: needs merge
man/XChangeWindowAttributes.man: needs merge
man/XCirculateEvent.man: needs merge
man/XCirculateRequestEvent.man: needs merge
man/XClearArea.man: needs merge
man/XClientMessageEvent.man: needs merge
man/XColormapEvent.man: needs merge
man/XConfigureEvent.man: needs merge
man/XConfigureRequestEvent.man: needs merge
man/XConfigureWindow.man: needs merge
man/XCopyArea.man: needs merge
man/XCreateColormap.man: needs merge
man/XCreateFontCursor.man: needs merge
man/XCreateFontSet.man: needs merge
man/XCreateGC.man: needs merge
man/XCreateIC.man: needs merge
man/XCreateOC.man: needs merge
man/XCreatePixmap.man: needs merge
man/XCreateRegion.man: needs merge
man/XCreateWindow.man: needs merge
man/XCreateWindowEvent.man: needs merge
man/XCrossingEvent.man: needs merge
man/XDefineCursor.man: needs merge
man/XDestroyWindow.man: needs merge
man/XDestroyWindowEvent.man: needs merge
man/XDrawArc.man: needs merge
man/XDrawImageString.man: needs merge
man/XDrawLine.man: needs merge
man/XDrawPoint.man: needs merge
man/XDrawRectangle.man: needs merge
man/XDrawString.man: needs merge
man/XDrawText.man: needs merge
man/XEmptyRegion.man: needs merge
man/XErrorEvent.man: needs merge
man/XExposeEvent.man: needs merge
man/XExtentsOfFontSet.man: needs merge
man/XFillRectangle.man: needs merge
man/XFilterEvent.man: needs merge
man/XFlush.man: needs merge
man/XFocusChangeEvent.man: needs merge
man/XFontSetExtents.man: needs merge
man/XFontsOfFontSet.man: needs merge
man/XFree.man: needs merge
man/XGetVisualInfo.man: needs merge
man/XGetWindowAttributes.man: needs merge
man/XGetWindowProperty.man: needs merge
man/XGrabButton.man: needs merge
man/XGrabKey.man: needs merge
man/XGrabKeyboard.man: needs merge
man/XGrabPointer.man: needs merge
man/XGrabServer.man: needs merge
man/XGraphicsExposeEvent.man: needs merge
man/XGravityEvent.man: needs merge
man/XIconifyWindow.man: needs merge
man/XIfEvent.man: needs merge
man/XInitImage.man: needs merge
man/XInitThreads.man: needs merge
man/XInstallColormap.man: needs merge
man/XInternAtom.man: needs merge
man/XIntersectRegion.man: needs merge
man/XKeymapEvent.man: needs merge
man/XListFonts.man: needs merge
man/XLoadFont.man: needs merge
man/XLookupKeysym.man: needs merge
man/XMapEvent.man: needs merge
man/XMapRequestEvent.man: needs merge
man/XMapWindow.man: needs merge
man/XNextEvent.man: needs merge
man/XNoOp.man: needs merge
man/XOpenDisplay.man: needs merge
man/XOpenIM.man: needs merge
man/XOpenOM.man: needs merge
man/XParseGeometry.man: needs merge
man/XPolygonRegion.man: needs merge
man/XPropertyEvent.man: needs merge
man/XPutBackEvent.man: needs merge
man/XPutImage.man: needs merge
man/XQueryBestSize.man: needs merge
man/XQueryColor.man: needs merge
man/XQueryExtension.man: needs merge
man/XQueryPointer.man: needs merge
man/XQueryTree.man: needs merge
man/XRaiseWindow.man: needs merge
man/XReadBitmapFile.man: needs merge
man/XRecolorCursor.man: needs merge
man/XReparentEvent.man: needs merge
man/XReparentWindow.man: needs merge
man/XResizeRequestEvent.man: needs merge
man/XResourceManagerString.man: needs merge
man/XSaveContext.man: needs merge
man/XSelectInput.man: needs merge
man/XSelectionClearEvent.man: needs merge
man/XSelectionEvent.man: needs merge
man/XSelectionRequestEvent.man: needs merge
man/XSendEvent.man: needs merge
man/XSetArcMode.man: needs merge
man/XSetClipOrigin.man: needs merge
man/XSetCloseDownMode.man: needs merge
man/XSetCommand.man: needs merge
man/XSetErrorHandler.man: needs merge
man/XSetFillStyle.man: needs merge
man/XSetFont.man: needs merge
man/XSetFontPath.man: needs merge
man/XSetICFocus.man: needs merge
man/XSetICValues.man: needs merge
man/XSetInputFocus.man: needs merge
man/XSetLineAttributes.man: needs merge
man/XSetPointerMapping.man: needs merge
man/XSetScreenSaver.man: needs merge
man/XSetSelectionOwner.man: needs merge
man/XSetState.man: needs merge
man/XSetTextProperty.man: needs merge
man/XSetTile.man: needs merge
man/XSetTransientForHint.man: needs merge
man/XSetWMClientMachine.man: needs merge
man/XSetWMColormapWindows.man: needs merge
man/XSetWMIconName.man: needs merge
man/XSetWMName.man: needs merge
man/XSetWMProperties.man: needs merge
man/XSetWMProtocols.man: needs merge
man/XStoreBytes.man: needs merge
man/XStoreColors.man: needs merge
man/XStringListToTextProperty.man: needs merge
man/XStringToKeysym.man: needs merge
man/XSupportsLocale.man: needs merge
man/XSynchronize.man: needs merge
man/XTextExtents.man: needs merge
man/XTextWidth.man: needs merge
man/XTranslateCoordinates.man: needs merge
man/XUnmapEvent.man: needs merge
man/XUnmapWindow.man: needs merge
man/XVaCreateNestedList.man: needs merge
man/XVisibilityEvent.man: needs merge
man/XWarpPointer.man: needs merge
man/XcmsAllocColor.man: needs merge
man/XcmsCCCOfColormap.man: needs merge
man/XcmsCIELabQueryMaxC.man: needs merge
man/XcmsCIELuvQueryMaxC.man: needs merge
man/XcmsColor.man: needs merge
man/XcmsConvertColors.man: needs merge
man/XcmsCreateCCC.man: needs merge
man/XcmsDefaultCCC.man: needs merge
man/XcmsQueryBlack.man: needs merge
man/XcmsQueryColor.man: needs merge
man/XcmsSetWhitePoint.man: needs merge
man/XcmsStoreColor.man: needs merge
man/XcmsTekHVCQueryMaxC.man: needs merge
man/XmbDrawImageString.man: needs merge
man/XmbDrawString.man: needs merge
man/XmbDrawText.man: needs merge
man/XmbLookupString.man: needs merge
man/XmbResetIC.man: needs merge
man/XmbTextEscapement.man: needs merge
man/XmbTextExtents.man: needs merge
man/XmbTextListToTextProperty.man: needs merge
man/XmbTextPerCharExtents.man: needs merge
man/XrmEnumerateDatabase.man: needs merge
man/XrmGetFileDatabase.man: needs merge
man/XrmGetResource.man: needs merge
man/XrmInitialize.man: needs merge
man/XrmMergeDatabases.man: needs merge
man/XrmPutResource.man: needs merge
man/XrmUniqueQuark.man: needs merge
modules/im/ximcp/imDefIm.c: needs merge
modules/im/ximcp/imDefLkup.c: needs merge
modules/im/ximcp/imExten.c: needs merge
modules/im/ximcp/imInt.c: needs merge
modules/im/ximcp/imLcIm.c: needs merge
modules/im/ximcp/imLcPrs.c: needs merge
modules/im/ximcp/imRm.c: needs merge
modules/im/ximcp/imTrX.c: needs merge
modules/lc/gen/lcGenConv.c: needs merge
modules/om/generic/omGeneric.c: needs merge
modules/om/generic/omXChar.c: needs merge
nls/Makefile.am: needs merge
nls/compose.dir.pre: needs merge
nls/el_GR.UTF-8/Compose.pre: needs merge
nls/en_US.UTF-8/Compose.pre: needs merge
nls/en_US.UTF-8/XI18N_OBJS: needs merge
nls/iso8859-13/Compose.pre: needs merge
nls/iso8859-14/Compose.pre: needs merge
nls/iso8859-15/Compose.pre: needs merge
nls/iso8859-2/Compose.pre: needs merge
nls/iso8859-3/Compose.pre: needs merge
nls/iso8859-4/Compose.pre: needs merge
nls/iso8859-7/Compose.pre: needs merge
nls/iso8859-9/Compose.pre: needs merge
nls/iso8859-9e/Compose.pre: needs merge
nls/locale.alias.pre: needs merge
nls/locale.dir.pre: needs merge
nls/pt_BR.UTF-8/Compose.pre: needs merge
nls/vi_VN.tcvn/Compose.pre: needs merge
nls/vi_VN.viscii/Compose.pre: needs merge
src/AllCells.c: needs merge
src/AllPlanes.c: needs merge
src/AllowEv.c: needs merge
src/AutoRep.c: needs merge
src/Backgnd.c: needs merge
src/BdrWidth.c: needs merge
src/Bell.c: needs merge
src/Border.c: needs merge
src/ChAccCon.c: needs merge
src/ChActPGb.c: needs merge
src/ChClMode.c: needs merge
src/ChCmap.c: needs merge
src/ChGC.c: needs merge
src/ChKeyCon.c: needs merge
src/ChPntCon.c: needs merge
src/ChSaveSet.c: needs merge
src/ChWAttrs.c: needs merge
src/ChWindow.c: needs merge
src/ChkIfEv.c: needs merge
src/ChkMaskEv.c: needs merge
src/ChkTypEv.c: needs merge
src/ChkTypWEv.c: needs merge
src/ChkWinEv.c: needs merge
src/CirWin.c: needs merge
src/CirWinDn.c: needs merge
src/CirWinUp.c: needs merge
src/ClDisplay.c: needs merge
src/Clear.c: needs merge
src/ClearArea.c: needs merge
src/ConfWind.c: needs merge
src/ConnDis.c: needs merge
src/ConvSel.c: needs merge
src/CopyArea.c: needs merge
src/CopyCmap.c: needs merge
src/CopyGC.c: needs merge
src/CopyPlane.c: needs merge
src/CrCmap.c: needs merge
src/CrCursor.c: needs merge
src/CrGC.c: needs merge
src/CrGlCur.c: needs merge
src/CrPFBData.c: needs merge
src/CrPixmap.c: needs merge
src/CrWindow.c: needs merge
src/Cursor.c: needs merge
src/DefCursor.c: needs merge
src/DelProp.c: needs merge
src/Depths.c: needs merge
src/DestSubs.c: needs merge
src/DestWind.c: needs merge
src/DrArc.c: needs merge
src/DrArcs.c: needs merge
src/DrLine.c: needs merge
src/DrLines.c: needs merge
src/DrPoint.c: needs merge
src/DrPoints.c: needs merge
src/DrRect.c: needs merge
src/DrRects.c: needs merge
src/DrSegs.c: needs merge
src/ErrDes.c: needs merge
src/FSSaver.c: needs merge
src/FSWrap.c: needs merge
src/FetchName.c: needs merge
src/FillArc.c: needs merge
src/FillArcs.c: needs merge
src/FillPoly.c: needs merge
src/FillRct.c: needs merge
src/FillRcts.c: needs merge
src/FilterEv.c: needs merge
src/Flush.c: needs merge
src/Font.c: needs merge
src/FontInfo.c: needs merge
src/FontNames.c: needs merge
src/FreeCmap.c: needs merge
src/FreeCols.c: needs merge
src/FreeCurs.c: needs merge
src/FreeEData.c: needs merge
src/FreeGC.c: needs merge
src/FreePix.c: needs merge
src/GCMisc.c: needs merge
src/GetAtomNm.c: needs merge
src/GetColor.c: needs merge
src/GetDflt.c: needs merge
src/GetFPath.c: needs merge
src/GetFProp.c: needs merge
src/GetGCVals.c: needs merge
src/GetGeom.c: needs merge
src/GetHColor.c: needs merge
src/GetHints.c: needs merge
src/GetIFocus.c: needs merge
src/GetImage.c: needs merge
src/GetKCnt.c: needs merge
src/GetMoEv.c: needs merge
src/GetNrmHint.c: needs merge
src/GetPCnt.c: needs merge
src/GetPntMap.c: needs merge
src/GetProp.c: needs merge
src/GetRGBCMap.c: needs merge
src/GetSOwner.c: needs merge
src/GetSSaver.c: needs merge
src/GetStCmap.c: needs merge
src/GetTxtProp.c: needs merge
src/GetWMCMapW.c: needs merge
src/GetWMProto.c: needs merge
src/GrButton.c: needs merge
src/GrKey.c: needs merge
src/GrKeybd.c: needs merge
src/GrPointer.c: needs merge
src/GrServer.c: needs merge
src/Iconify.c: needs merge
src/IfEvent.c: needs merge
src/ImUtil.c: needs merge
src/InitExt.c: needs merge
src/InsCmap.c: needs merge
src/IntAtom.c: needs merge
src/KeyBind.c: needs merge
src/KeysymStr.c: needs merge
src/KillCl.c: needs merge
src/LiHosts.c: needs merge
src/LiICmaps.c: needs merge
src/LiProps.c: needs merge
src/ListExt.c: needs merge
src/LookupCol.c: needs merge
src/LowerWin.c: needs merge
src/Macros.c: needs merge
src/Makefile.am: needs merge
src/MapRaised.c: needs merge
src/MapSubs.c: needs merge
src/MapWindow.c: needs merge
src/MaskEvent.c: needs merge
src/Misc.c: needs merge
src/ModMap.c: needs merge
src/MoveWin.c: needs merge
src/NextEvent.c: needs merge
src/OCWrap.c: needs merge
src/OMWrap.c: needs merge
src/OpenDis.c: needs merge
src/ParseCmd.c: needs merge
src/ParseCol.c: needs merge
src/PeekEvent.c: needs merge
src/PeekIfEv.c: needs merge
src/Pending.c: needs merge
src/PixFormats.c: needs merge
src/PmapBgnd.c: needs merge
src/PmapBord.c: needs merge
src/PolyReg.c: needs merge
src/PolyTxt.c: needs merge
src/PolyTxt16.c: needs merge
src/PropAlloc.c: needs merge
src/PutImage.c: needs merge
src/QuBest.c: needs merge
src/QuColor.c: needs merge
src/QuColors.c: needs merge
src/QuCurShp.c: needs merge
src/QuKeybd.c: needs merge
src/QuPntr.c: needs merge
src/QuStipShp.c: needs merge
src/QuTileShp.c: needs merge
src/QuTree.c: needs merge
src/Quarks.c: needs merge
src/RaiseWin.c: needs merge
src/RdBitF.c: needs merge
src/RecolorC.c: needs merge
src/ReconfWM.c: needs merge
src/ReconfWin.c: needs merge
src/RepWindow.c: needs merge
src/RestackWs.c: needs merge
src/RotProp.c: needs merge
src/ScrResStr.c: needs merge
src/SelInput.c: needs merge
src/SendEvent.c: needs merge
src/SetBack.c: needs merge
src/SetCRects.c: needs merge
src/SetClMask.c: needs merge
src/SetClOrig.c: needs merge
src/SetFPath.c: needs merge
src/SetFont.c: needs merge
src/SetFore.c: needs merge
src/SetFunc.c: needs merge
src/SetHints.c: needs merge
src/SetIFocus.c: needs merge
src/SetLStyle.c: needs merge
src/SetLocale.c: needs merge
src/SetNrmHint.c: needs merge
src/SetPMask.c: needs merge
src/SetPntMap.c: needs merge
src/SetRGBCMap.c: needs merge
src/SetSOwner.c: needs merge
src/SetSSaver.c: needs merge
src/SetStCmap.c: needs merge
src/SetState.c: needs merge
src/SetStip.c: needs merge
src/SetTSOrig.c: needs merge
src/SetTile.c: needs merge
src/SetTxtProp.c: needs merge
src/SetWMCMapW.c: needs merge
src/SetWMProto.c: needs merge
src/StBytes.c: needs merge
src/StColor.c: needs merge
src/StColors.c: needs merge
src/StNColor.c: needs merge
src/StrKeysym.c: needs merge
src/StrToText.c: needs merge
src/Sync.c: needs merge
src/TextToStr.c: needs merge
src/TrCoords.c: needs merge
src/UndefCurs.c: needs merge
src/UngrabBut.c: needs merge
src/UngrabKbd.c: needs merge
src/UngrabKey.c: needs merge
src/UngrabPtr.c: needs merge
src/UngrabSvr.c: needs merge
src/UninsCmap.c: needs merge
src/UnldFont.c: needs merge
src/UnmapSubs.c: needs merge
src/UnmapWin.c: needs merge
src/VisUtil.c: needs merge
src/WMProps.c: needs merge
src/WarpPtr.c: needs merge
src/WinEvent.c: needs merge
src/Window.c: needs merge
src/Withdraw.c: needs merge
src/WrBitF.c: needs merge
src/XErrorDB: needs merge
src/XKeysymDB: needs merge
src/Xintconn.h: needs merge
src/XlibAsync.c: needs merge
src/XlibInt.c: needs merge
src/Xrm.c: needs merge
src/imConv.c: needs merge
src/util/Makefile.am: needs merge
src/xcms/AddDIC.c: needs merge
src/xcms/AddSF.c: needs merge
src/xcms/CCC.c: needs merge
src/xcms/CvCols.c: needs merge
src/xcms/HVC.c: needs merge
src/xcms/HVCGcC.c: needs merge
src/xcms/HVCGcV.c: needs merge
src/xcms/HVCGcVC.c: needs merge
src/xcms/HVCMnV.c: needs merge
src/xcms/HVCMxC.c: needs merge
src/xcms/HVCMxV.c: needs merge
src/xcms/HVCMxVC.c: needs merge
src/xcms/HVCMxVs.c: needs merge
src/xcms/HVCWpAj.c: needs merge
src/xcms/IdOfPr.c: needs merge
src/xcms/LRGB.c: needs merge
src/xcms/Lab.c: needs merge
src/xcms/LabGcC.c: needs merge
src/xcms/LabGcL.c: needs merge
src/xcms/LabGcLC.c: needs merge
src/xcms/LabMnL.c: needs merge
src/xcms/LabMxC.c: needs merge
src/xcms/LabMxL.c: needs merge
src/xcms/LabMxLC.c: needs merge
src/xcms/LabWpAj.c: needs merge
src/xcms/Luv.c: needs merge
src/xcms/LuvGcC.c: needs merge
src/xcms/LuvGcL.c: needs merge
src/xcms/LuvGcLC.c: needs merge
src/xcms/LuvMnL.c: needs merge
src/xcms/LuvMxC.c: needs merge
src/xcms/LuvMxL.c: needs merge
src/xcms/LuvMxLC.c: needs merge
src/xcms/LuvWpAj.c: needs merge
src/xcms/Makefile.am: needs merge
src/xcms/OfCCC.c: needs merge
src/xcms/PrOfId.c: needs merge
src/xcms/QBlack.c: needs merge
src/xcms/QBlue.c: needs merge
src/xcms/QGreen.c: needs merge
src/xcms/QRed.c: needs merge
src/xcms/QWhite.c: needs merge
src/xcms/QuCol.c: needs merge
src/xcms/QuCols.c: needs merge
src/xcms/SetCCC.c: needs merge
src/xcms/StCol.c: needs merge
src/xcms/StCols.c: needs merge
src/xcms/XYZ.c: needs merge
src/xcms/cmsAllCol.c: needs merge
src/xcms/cmsCmap.c: needs merge
src/xcms/cmsColNm.c: needs merge
src/xcms/cmsMath.c: needs merge
src/xcms/cmsTrig.c: needs merge
src/xcms/uvY.c: needs merge
src/xcms/xyY.c: needs merge
src/xkb/Makefile.am: needs merge
src/xkb/XKBCvt.c: needs merge
src/xkb/XKBExtDev.c: needs merge
src/xkb/XKBGeom.c: needs merge
src/xkb/XKBGetMap.c: needs merge
src/xkb/XKBRdBuf.c: needs merge
src/xkb/XKBSetGeom.c: needs merge
src/xkb/XKBleds.c: needs merge
src/xkb/XKBlibint.h: needs merge
src/xlibi18n/Makefile.am: needs merge
src/xlibi18n/XDefaultIMIF.c: needs merge
src/xlibi18n/XimTrInt.h: needs merge
src/xlibi18n/Ximint.h: needs merge
src/xlibi18n/XlcPubI.h: needs merge
src/xlibi18n/Xlcint.h: needs merge
src/xlibi18n/lcCT.c: needs merge
src/xlibi18n/lcDB.c: needs merge
src/xlibi18n/lcFile.c: needs merge
x11.pc.in: needs merge
#	unmerged:   man/Makefile.am
+ Discarding Debian differences in man/Makefile.am
AUTHORS: needs merge
NEWS: needs merge
README: needs merge
acinclude.m4: needs merge
configure.ac: needs merge
cpprules.in: needs merge
include/Makefile.am: needs merge
include/X11/Xlibint.h: needs merge
man/AllPlanes.man: needs merge
man/BlackPixelOfScreen.man: needs merge
man/DisplayOfCCC.man: needs merge
man/ImageByteOrder.man: needs merge
man/IsCursorKey.man: needs merge
man/XAddConnectionWatch.man: needs merge
man/XAddHost.man: needs merge
man/XAllocClassHint.man: needs merge
man/XAllocColor.man: needs merge
man/XAllocIconSize.man: needs merge
man/XAllocSizeHints.man: needs merge
man/XAllocStandardColormap.man: needs merge
man/XAllocWMHints.man: needs merge
man/XAllowEvents.man: needs merge
man/XAnyEvent.man: needs merge
man/XButtonEvent.man: needs merge
man/XChangeKeyboardControl.man: needs merge
man/XChangeKeyboardMapping.man: needs merge
man/XChangePointerControl.man: needs merge
man/XChangeSaveSet.man: needs merge
man/XChangeWindowAttributes.man: needs merge
man/XCirculateEvent.man: needs merge
man/XCirculateRequestEvent.man: needs merge
man/XClearArea.man: needs merge
man/XClientMessageEvent.man: needs merge
man/XColormapEvent.man: needs merge
man/XConfigureEvent.man: needs merge
man/XConfigureRequestEvent.man: needs merge
man/XConfigureWindow.man: needs merge
man/XCopyArea.man: needs merge
man/XCreateColormap.man: needs merge
man/XCreateFontCursor.man: needs merge
man/XCreateFontSet.man: needs merge
man/XCreateGC.man: needs merge
man/XCreateIC.man: needs merge
man/XCreateOC.man: needs merge
man/XCreatePixmap.man: needs merge
man/XCreateRegion.man: needs merge
man/XCreateWindow.man: needs merge
man/XCreateWindowEvent.man: needs merge
man/XCrossingEvent.man: needs merge
man/XDefineCursor.man: needs merge
man/XDestroyWindow.man: needs merge
man/XDestroyWindowEvent.man: needs merge
man/XDrawArc.man: needs merge
man/XDrawImageString.man: needs merge
man/XDrawLine.man: needs merge
man/XDrawPoint.man: needs merge
man/XDrawRectangle.man: needs merge
man/XDrawString.man: needs merge
man/XDrawText.man: needs merge
man/XEmptyRegion.man: needs merge
man/XErrorEvent.man: needs merge
man/XExposeEvent.man: needs merge
man/XExtentsOfFontSet.man: needs merge
man/XFillRectangle.man: needs merge
man/XFilterEvent.man: needs merge
man/XFlush.man: needs merge
man/XFocusChangeEvent.man: needs merge
man/XFontSetExtents.man: needs merge
man/XFontsOfFontSet.man: needs merge
man/XFree.man: needs merge
man/XGetVisualInfo.man: needs merge
man/XGetWindowAttributes.man: needs merge
man/XGetWindowProperty.man: needs merge
man/XGrabButton.man: needs merge
man/XGrabKey.man: needs merge
man/XGrabKeyboard.man: needs merge
man/XGrabPointer.man: needs merge
man/XGrabServer.man: needs merge
man/XGraphicsExposeEvent.man: needs merge
man/XGravityEvent.man: needs merge
man/XIconifyWindow.man: needs merge
man/XIfEvent.man: needs merge
man/XInitImage.man: needs merge
man/XInitThreads.man: needs merge
man/XInstallColormap.man: needs merge
man/XInternAtom.man: needs merge
man/XIntersectRegion.man: needs merge
man/XKeymapEvent.man: needs merge
man/XListFonts.man: needs merge
man/XLoadFont.man: needs merge
man/XLookupKeysym.man: needs merge
man/XMapEvent.man: needs merge
man/XMapRequestEvent.man: needs merge
man/XMapWindow.man: needs merge
man/XNextEvent.man: needs merge
man/XNoOp.man: needs merge
man/XOpenDisplay.man: needs merge
man/XOpenIM.man: needs merge
man/XOpenOM.man: needs merge
man/XParseGeometry.man: needs merge
man/XPolygonRegion.man: needs merge
man/XPropertyEvent.man: needs merge
man/XPutBackEvent.man: needs merge
man/XPutImage.man: needs merge
man/XQueryBestSize.man: needs merge
man/XQueryColor.man: needs merge
man/XQueryExtension.man: needs merge
man/XQueryPointer.man: needs merge
man/XQueryTree.man: needs merge
man/XRaiseWindow.man: needs merge
man/XReadBitmapFile.man: needs merge
man/XRecolorCursor.man: needs merge
man/XReparentEvent.man: needs merge
man/XReparentWindow.man: needs merge
man/XResizeRequestEvent.man: needs merge
man/XResourceManagerString.man: needs merge
man/XSaveContext.man: needs merge
man/XSelectInput.man: needs merge
man/XSelectionClearEvent.man: needs merge
man/XSelectionEvent.man: needs merge
man/XSelectionRequestEvent.man: needs merge
man/XSendEvent.man: needs merge
man/XSetArcMode.man: needs merge
man/XSetClipOrigin.man: needs merge
man/XSetCloseDownMode.man: needs merge
man/XSetCommand.man: needs merge
man/XSetErrorHandler.man: needs merge
man/XSetFillStyle.man: needs merge
man/XSetFont.man: needs merge
man/XSetFontPath.man: needs merge
man/XSetICFocus.man: needs merge
man/XSetICValues.man: needs merge
man/XSetInputFocus.man: needs merge
man/XSetLineAttributes.man: needs merge
man/XSetPointerMapping.man: needs merge
man/XSetScreenSaver.man: needs merge
man/XSetSelectionOwner.man: needs merge
man/XSetState.man: needs merge
man/XSetTextProperty.man: needs merge
man/XSetTile.man: needs merge
man/XSetTransientForHint.man: needs merge
man/XSetWMClientMachine.man: needs merge
man/XSetWMColormapWindows.man: needs merge
man/XSetWMIconName.man: needs merge
man/XSetWMName.man: needs merge
man/XSetWMProperties.man: needs merge
man/XSetWMProtocols.man: needs merge
man/XStoreBytes.man: needs merge
man/XStoreColors.man: needs merge
man/XStringListToTextProperty.man: needs merge
man/XStringToKeysym.man: needs merge
man/XSupportsLocale.man: needs merge
man/XSynchronize.man: needs merge
man/XTextExtents.man: needs merge
man/XTextWidth.man: needs merge
man/XTranslateCoordinates.man: needs merge
man/XUnmapEvent.man: needs merge
man/XUnmapWindow.man: needs merge
man/XVaCreateNestedList.man: needs merge
man/XVisibilityEvent.man: needs merge
man/XWarpPointer.man: needs merge
man/XcmsAllocColor.man: needs merge
man/XcmsCCCOfColormap.man: needs merge
man/XcmsCIELabQueryMaxC.man: needs merge
man/XcmsCIELuvQueryMaxC.man: needs merge
man/XcmsColor.man: needs merge
man/XcmsConvertColors.man: needs merge
man/XcmsCreateCCC.man: needs merge
man/XcmsDefaultCCC.man: needs merge
man/XcmsQueryBlack.man: needs merge
man/XcmsQueryColor.man: needs merge
man/XcmsSetWhitePoint.man: needs merge
man/XcmsStoreColor.man: needs merge
man/XcmsTekHVCQueryMaxC.man: needs merge
man/XmbDrawImageString.man: needs merge
man/XmbDrawString.man: needs merge
man/XmbDrawText.man: needs merge
man/XmbLookupString.man: needs merge
man/XmbResetIC.man: needs merge
man/XmbTextEscapement.man: needs merge
man/XmbTextExtents.man: needs merge
man/XmbTextListToTextProperty.man: needs merge
man/XmbTextPerCharExtents.man: needs merge
man/XrmEnumerateDatabase.man: needs merge
man/XrmGetFileDatabase.man: needs merge
man/XrmGetResource.man: needs merge
man/XrmInitialize.man: needs merge
man/XrmMergeDatabases.man: needs merge
man/XrmPutResource.man: needs merge
man/XrmUniqueQuark.man: needs merge
modules/im/ximcp/imDefIm.c: needs merge
modules/im/ximcp/imDefLkup.c: needs merge
modules/im/ximcp/imExten.c: needs merge
modules/im/ximcp/imInt.c: needs merge
modules/im/ximcp/imLcIm.c: needs merge
modules/im/ximcp/imLcPrs.c: needs merge
modules/im/ximcp/imRm.c: needs merge
modules/im/ximcp/imTrX.c: needs merge
modules/lc/gen/lcGenConv.c: needs merge
modules/om/generic/omGeneric.c: needs merge
modules/om/generic/omXChar.c: needs merge
nls/Makefile.am: needs merge
nls/compose.dir.pre: needs merge
nls/el_GR.UTF-8/Compose.pre: needs merge
nls/en_US.UTF-8/Compose.pre: needs merge
nls/en_US.UTF-8/XI18N_OBJS: needs merge
nls/iso8859-13/Compose.pre: needs merge
nls/iso8859-14/Compose.pre: needs merge
nls/iso8859-15/Compose.pre: needs merge
nls/iso8859-2/Compose.pre: needs merge
nls/iso8859-3/Compose.pre: needs merge
nls/iso8859-4/Compose.pre: needs merge
nls/iso8859-7/Compose.pre: needs merge
nls/iso8859-9/Compose.pre: needs merge
nls/iso8859-9e/Compose.pre: needs merge
nls/locale.alias.pre: needs merge
nls/locale.dir.pre: needs merge
nls/pt_BR.UTF-8/Compose.pre: needs merge
nls/vi_VN.tcvn/Compose.pre: needs merge
nls/vi_VN.viscii/Compose.pre: needs merge
src/AllCells.c: needs merge
src/AllPlanes.c: needs merge
src/AllowEv.c: needs merge
src/AutoRep.c: needs merge
src/Backgnd.c: needs merge
src/BdrWidth.c: needs merge
src/Bell.c: needs merge
src/Border.c: needs merge
src/ChAccCon.c: needs merge
src/ChActPGb.c: needs merge
src/ChClMode.c: needs merge
src/ChCmap.c: needs merge
src/ChGC.c: needs merge
src/ChKeyCon.c: needs merge
src/ChPntCon.c: needs merge
src/ChSaveSet.c: needs merge
src/ChWAttrs.c: needs merge
src/ChWindow.c: needs merge
src/ChkIfEv.c: needs merge
src/ChkMaskEv.c: needs merge
src/ChkTypEv.c: needs merge
src/ChkTypWEv.c: needs merge
src/ChkWinEv.c: needs merge
src/CirWin.c: needs merge
src/CirWinDn.c: needs merge
src/CirWinUp.c: needs merge
src/ClDisplay.c: needs merge
src/Clear.c: needs merge
src/ClearArea.c: needs merge
src/ConfWind.c: needs merge
src/ConnDis.c: needs merge
src/ConvSel.c: needs merge
src/CopyArea.c: needs merge
src/CopyCmap.c: needs merge
src/CopyGC.c: needs merge
src/CopyPlane.c: needs merge
src/CrCmap.c: needs merge
src/CrCursor.c: needs merge
src/CrGC.c: needs merge
src/CrGlCur.c: needs merge
src/CrPFBData.c: needs merge
src/CrPixmap.c: needs merge
src/CrWindow.c: needs merge
src/Cursor.c: needs merge
src/DefCursor.c: needs merge
src/DelProp.c: needs merge
src/Depths.c: needs merge
src/DestSubs.c: needs merge
src/DestWind.c: needs merge
src/DrArc.c: needs merge
src/DrArcs.c: needs merge
src/DrLine.c: needs merge
src/DrLines.c: needs merge
src/DrPoint.c: needs merge
src/DrPoints.c: needs merge
src/DrRect.c: needs merge
src/DrRects.c: needs merge
src/DrSegs.c: needs merge
src/ErrDes.c: needs merge
src/FSSaver.c: needs merge
src/FSWrap.c: needs merge
src/FetchName.c: needs merge
src/FillArc.c: needs merge
src/FillArcs.c: needs merge
src/FillPoly.c: needs merge
src/FillRct.c: needs merge
src/FillRcts.c: needs merge
src/FilterEv.c: needs merge
src/Flush.c: needs merge
src/Font.c: needs merge
src/FontInfo.c: needs merge
src/FontNames.c: needs merge
src/FreeCmap.c: needs merge
src/FreeCols.c: needs merge
src/FreeCurs.c: needs merge
src/FreeEData.c: needs merge
src/FreeGC.c: needs merge
src/FreePix.c: needs merge
src/GCMisc.c: needs merge
src/GetAtomNm.c: needs merge
src/GetColor.c: needs merge
src/GetDflt.c: needs merge
src/GetFPath.c: needs merge
src/GetFProp.c: needs merge
src/GetGCVals.c: needs merge
src/GetGeom.c: needs merge
src/GetHColor.c: needs merge
src/GetHints.c: needs merge
src/GetIFocus.c: needs merge
src/GetImage.c: needs merge
src/GetKCnt.c: needs merge
src/GetMoEv.c: needs merge
src/GetNrmHint.c: needs merge
src/GetPCnt.c: needs merge
src/GetPntMap.c: needs merge
src/GetProp.c: needs merge
src/GetRGBCMap.c: needs merge
src/GetSOwner.c: needs merge
src/GetSSaver.c: needs merge
src/GetStCmap.c: needs merge
src/GetTxtProp.c: needs merge
src/GetWMCMapW.c: needs merge
src/GetWMProto.c: needs merge
src/GrButton.c: needs merge
src/GrKey.c: needs merge
src/GrKeybd.c: needs merge
src/GrPointer.c: needs merge
src/GrServer.c: needs merge
src/Iconify.c: needs merge
src/IfEvent.c: needs merge
src/ImUtil.c: needs merge
src/InitExt.c: needs merge
src/InsCmap.c: needs merge
src/IntAtom.c: needs merge
src/KeyBind.c: needs merge
src/KeysymStr.c: needs merge
src/KillCl.c: needs merge
src/LiHosts.c: needs merge
src/LiICmaps.c: needs merge
src/LiProps.c: needs merge
src/ListExt.c: needs merge
src/LookupCol.c: needs merge
src/LowerWin.c: needs merge
src/Macros.c: needs merge
src/Makefile.am: needs merge
src/MapRaised.c: needs merge
src/MapSubs.c: needs merge
src/MapWindow.c: needs merge
src/MaskEvent.c: needs merge
src/Misc.c: needs merge
src/ModMap.c: needs merge
src/MoveWin.c: needs merge
src/NextEvent.c: needs merge
src/OCWrap.c: needs merge
src/OMWrap.c: needs merge
src/OpenDis.c: needs merge
src/ParseCmd.c: needs merge
src/ParseCol.c: needs merge
src/PeekEvent.c: needs merge
src/PeekIfEv.c: needs merge
src/Pending.c: needs merge
src/PixFormats.c: needs merge
src/PmapBgnd.c: needs merge
src/PmapBord.c: needs merge
src/PolyReg.c: needs merge
src/PolyTxt.c: needs merge
src/PolyTxt16.c: needs merge
src/PropAlloc.c: needs merge
src/PutImage.c: needs merge
src/QuBest.c: needs merge
src/QuColor.c: needs merge
src/QuColors.c: needs merge
src/QuCurShp.c: needs merge
src/QuKeybd.c: needs merge
src/QuPntr.c: needs merge
src/QuStipShp.c: needs merge
src/QuTileShp.c: needs merge
src/QuTree.c: needs merge
src/Quarks.c: needs merge
src/RaiseWin.c: needs merge
src/RdBitF.c: needs merge
src/RecolorC.c: needs merge
src/ReconfWM.c: needs merge
src/ReconfWin.c: needs merge
src/RepWindow.c: needs merge
src/RestackWs.c: needs merge
src/RotProp.c: needs merge
src/ScrResStr.c: needs merge
src/SelInput.c: needs merge
src/SendEvent.c: needs merge
src/SetBack.c: needs merge
src/SetCRects.c: needs merge
src/SetClMask.c: needs merge
src/SetClOrig.c: needs merge
src/SetFPath.c: needs merge
src/SetFont.c: needs merge
src/SetFore.c: needs merge
src/SetFunc.c: needs merge
src/SetHints.c: needs merge
src/SetIFocus.c: needs merge
src/SetLStyle.c: needs merge
src/SetLocale.c: needs merge
src/SetNrmHint.c: needs merge
src/SetPMask.c: needs merge
src/SetPntMap.c: needs merge
src/SetRGBCMap.c: needs merge
src/SetSOwner.c: needs merge
src/SetSSaver.c: needs merge
src/SetStCmap.c: needs merge
src/SetState.c: needs merge
src/SetStip.c: needs merge
src/SetTSOrig.c: needs merge
src/SetTile.c: needs merge
src/SetTxtProp.c: needs merge
src/SetWMCMapW.c: needs merge
src/SetWMProto.c: needs merge
src/StBytes.c: needs merge
src/StColor.c: needs merge
src/StColors.c: needs merge
src/StNColor.c: needs merge
src/StrKeysym.c: needs merge
src/StrToText.c: needs merge
src/Sync.c: needs merge
src/TextToStr.c: needs merge
src/TrCoords.c: needs merge
src/UndefCurs.c: needs merge
src/UngrabBut.c: needs merge
src/UngrabKbd.c: needs merge
src/UngrabKey.c: needs merge
src/UngrabPtr.c: needs merge
src/UngrabSvr.c: needs merge
src/UninsCmap.c: needs merge
src/UnldFont.c: needs merge
src/UnmapSubs.c: needs merge
src/UnmapWin.c: needs merge
src/VisUtil.c: needs merge
src/WMProps.c: needs merge
src/WarpPtr.c: needs merge
src/WinEvent.c: needs merge
src/Window.c: needs merge
src/Withdraw.c: needs merge
src/WrBitF.c: needs merge
src/XErrorDB: needs merge
src/XKeysymDB: needs merge
src/Xintconn.h: needs merge
src/XlibAsync.c: needs merge
src/XlibInt.c: needs merge
src/Xrm.c: needs merge
src/imConv.c: needs merge
src/util/Makefile.am: needs merge
src/xcms/AddDIC.c: needs merge
src/xcms/AddSF.c: needs merge
src/xcms/CCC.c: needs merge
src/xcms/CvCols.c: needs merge
src/xcms/HVC.c: needs merge
src/xcms/HVCGcC.c: needs merge
src/xcms/HVCGcV.c: needs merge
src/xcms/HVCGcVC.c: needs merge
src/xcms/HVCMnV.c: needs merge
src/xcms/HVCMxC.c: needs merge
src/xcms/HVCMxV.c: needs merge
src/xcms/HVCMxVC.c: needs merge
src/xcms/HVCMxVs.c: needs merge
src/xcms/HVCWpAj.c: needs merge
src/xcms/IdOfPr.c: needs merge
src/xcms/LRGB.c: needs merge
src/xcms/Lab.c: needs merge
src/xcms/LabGcC.c: needs merge
src/xcms/LabGcL.c: needs merge
src/xcms/LabGcLC.c: needs merge
src/xcms/LabMnL.c: needs merge
src/xcms/LabMxC.c: needs merge
src/xcms/LabMxL.c: needs merge
src/xcms/LabMxLC.c: needs merge
src/xcms/LabWpAj.c: needs merge
src/xcms/Luv.c: needs merge
src/xcms/LuvGcC.c: needs merge
src/xcms/LuvGcL.c: needs merge
src/xcms/LuvGcLC.c: needs merge
src/xcms/LuvMnL.c: needs merge
src/xcms/LuvMxC.c: needs merge
src/xcms/LuvMxL.c: needs merge
src/xcms/LuvMxLC.c: needs merge
src/xcms/LuvWpAj.c: needs merge
src/xcms/Makefile.am: needs merge
src/xcms/OfCCC.c: needs merge
src/xcms/PrOfId.c: needs merge
src/xcms/QBlack.c: needs merge
src/xcms/QBlue.c: needs merge
src/xcms/QGreen.c: needs merge
src/xcms/QRed.c: needs merge
src/xcms/QWhite.c: needs merge
src/xcms/QuCol.c: needs merge
src/xcms/QuCols.c: needs merge
src/xcms/SetCCC.c: needs merge
src/xcms/StCol.c: needs merge
src/xcms/StCols.c: needs merge
src/xcms/XYZ.c: needs merge
src/xcms/cmsAllCol.c: needs merge
src/xcms/cmsCmap.c: needs merge
src/xcms/cmsColNm.c: needs merge
src/xcms/cmsMath.c: needs merge
src/xcms/cmsTrig.c: needs merge
src/xcms/uvY.c: needs merge
src/xcms/xyY.c: needs merge
src/xkb/Makefile.am: needs merge
src/xkb/XKBCvt.c: needs merge
src/xkb/XKBExtDev.c: needs merge
src/xkb/XKBGeom.c: needs merge
src/xkb/XKBGetMap.c: needs merge
src/xkb/XKBRdBuf.c: needs merge
src/xkb/XKBSetGeom.c: needs merge
src/xkb/XKBleds.c: needs merge
src/xkb/XKBlibint.h: needs merge
src/xlibi18n/Makefile.am: needs merge
src/xlibi18n/XDefaultIMIF.c: needs merge
src/xlibi18n/XimTrInt.h: needs merge
src/xlibi18n/Ximint.h: needs merge
src/xlibi18n/XlcPubI.h: needs merge
src/xlibi18n/Xlcint.h: needs merge
src/xlibi18n/lcCT.c: needs merge
src/xlibi18n/lcDB.c: needs merge
src/xlibi18n/lcFile.c: needs merge
x11.pc.in: needs merge
#	unmerged:   man/AllPlanes.man
#	unmerged:   man/BlackPixelOfScreen.man
#	unmerged:   man/DisplayOfCCC.man
#	unmerged:   man/ImageByteOrder.man
#	unmerged:   man/IsCursorKey.man
#	unmerged:   man/XAddConnectionWatch.man
#	unmerged:   man/XAddHost.man
#	unmerged:   man/XAllocClassHint.man
#	unmerged:   man/XAllocColor.man
#	unmerged:   man/XAllocIconSize.man
#	unmerged:   man/XAllocSizeHints.man
#	unmerged:   man/XAllocStandardColormap.man
#	unmerged:   man/XAllocWMHints.man
#	unmerged:   man/XAllowEvents.man
#	unmerged:   man/XAnyEvent.man
#	unmerged:   man/XButtonEvent.man
#	unmerged:   man/XChangeKeyboardControl.man
#	unmerged:   man/XChangeKeyboardMapping.man
#	unmerged:   man/XChangePointerControl.man
#	unmerged:   man/XChangeSaveSet.man
#	unmerged:   man/XChangeWindowAttributes.man
#	unmerged:   man/XCirculateEvent.man
#	unmerged:   man/XCirculateRequestEvent.man
#	unmerged:   man/XClearArea.man
#	unmerged:   man/XClientMessageEvent.man
#	unmerged:   man/XColormapEvent.man
#	unmerged:   man/XConfigureEvent.man
#	unmerged:   man/XConfigureRequestEvent.man
#	unmerged:   man/XConfigureWindow.man
#	unmerged:   man/XCopyArea.man
#	unmerged:   man/XCreateColormap.man
#	unmerged:   man/XCreateFontCursor.man
#	unmerged:   man/XCreateFontSet.man
#	unmerged:   man/XCreateGC.man
#	unmerged:   man/XCreateIC.man
#	unmerged:   man/XCreateOC.man
#	unmerged:   man/XCreatePixmap.man
#	unmerged:   man/XCreateRegion.man
#	unmerged:   man/XCreateWindow.man
#	unmerged:   man/XCreateWindowEvent.man
#	unmerged:   man/XCrossingEvent.man
#	unmerged:   man/XDefineCursor.man
#	unmerged:   man/XDestroyWindow.man
#	unmerged:   man/XDestroyWindowEvent.man
#	unmerged:   man/XDrawArc.man
#	unmerged:   man/XDrawImageString.man
#	unmerged:   man/XDrawLine.man
#	unmerged:   man/XDrawPoint.man
#	unmerged:   man/XDrawRectangle.man
#	unmerged:   man/XDrawString.man
#	unmerged:   man/XDrawText.man
#	unmerged:   man/XEmptyRegion.man
#	unmerged:   man/XErrorEvent.man
#	unmerged:   man/XExposeEvent.man
#	unmerged:   man/XExtentsOfFontSet.man
#	unmerged:   man/XFillRectangle.man
#	unmerged:   man/XFilterEvent.man
#	unmerged:   man/XFlush.man
#	unmerged:   man/XFocusChangeEvent.man
#	unmerged:   man/XFontSetExtents.man
#	unmerged:   man/XFontsOfFontSet.man
#	unmerged:   man/XFree.man
#	unmerged:   man/XGetVisualInfo.man
#	unmerged:   man/XGetWindowAttributes.man
#	unmerged:   man/XGetWindowProperty.man
#	unmerged:   man/XGrabButton.man
#	unmerged:   man/XGrabKey.man
#	unmerged:   man/XGrabKeyboard.man
#	unmerged:   man/XGrabPointer.man
#	unmerged:   man/XGrabServer.man
#	unmerged:   man/XGraphicsExposeEvent.man
#	unmerged:   man/XGravityEvent.man
#	unmerged:   man/XIconifyWindow.man
#	unmerged:   man/XIfEvent.man
#	unmerged:   man/XInitImage.man
#	unmerged:   man/XInitThreads.man
#	unmerged:   man/XInstallColormap.man
#	unmerged:   man/XInternAtom.man
#	unmerged:   man/XIntersectRegion.man
#	unmerged:   man/XKeymapEvent.man
#	unmerged:   man/XListFonts.man
#	unmerged:   man/XLoadFont.man
#	unmerged:   man/XLookupKeysym.man
#	unmerged:   man/XMapEvent.man
#	unmerged:   man/XMapRequestEvent.man
#	unmerged:   man/XMapWindow.man
#	unmerged:   man/XNextEvent.man
#	unmerged:   man/XNoOp.man
#	unmerged:   man/XOpenDisplay.man
#	unmerged:   man/XOpenIM.man
#	unmerged:   man/XOpenOM.man
#	unmerged:   man/XParseGeometry.man
#	unmerged:   man/XPolygonRegion.man
#	unmerged:   man/XPropertyEvent.man
#	unmerged:   man/XPutBackEvent.man
#	unmerged:   man/XPutImage.man
#	unmerged:   man/XQueryBestSize.man
#	unmerged:   man/XQueryColor.man
#	unmerged:   man/XQueryExtension.man
#	unmerged:   man/XQueryPointer.man
#	unmerged:   man/XQueryTree.man
#	unmerged:   man/XRaiseWindow.man
#	unmerged:   man/XReadBitmapFile.man
#	unmerged:   man/XRecolorCursor.man
#	unmerged:   man/XReparentEvent.man
#	unmerged:   man/XReparentWindow.man
#	unmerged:   man/XResizeRequestEvent.man
#	unmerged:   man/XResourceManagerString.man
#	unmerged:   man/XSaveContext.man
#	unmerged:   man/XSelectInput.man
#	unmerged:   man/XSelectionClearEvent.man
#	unmerged:   man/XSelectionEvent.m