Module Name: xsrc
Committed By: mrg
Date: Sat Aug 13 23:51:48 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c
xsrc/external/mit/xorg-server/dist/randr: randr.c
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/glx/glxcmds.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/randr/randr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.