CVS commit: xsrc/external/mit/xorg-server/dist

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    xsrc
Committed By:   mrg
Date:           Mon Dec 19 19:37:36 UTC 2022

Modified Files:
        xsrc/external/mit/xorg-server/dist/Xi: sendexev.c
        xsrc/external/mit/xorg-server/dist/hw/xfree86/int10: generic.c
        xsrc/external/mit/xorg-server/dist/include: dix-config.h.in os.h

Log Message:
fix a couple of merge botches (duplicated) delete #if 0'd sections.

reduces diffs vs upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.5 -r1.6 \
    xsrc/external/mit/xorg-server/dist/hw/xfree86/int10/generic.c
cvs rdiff -u -r1.8 -r1.9 \
    xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/include/os.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.