Module Name: xsrc
Committed By: mrg
Date: Sun Aug 14 01:02:22 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
bsd_VTsw.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw: vgaHW.h
Log Message:
fix merge botches.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_VTsw.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
