Module Name: xsrc Committed By: skrll Date: Sun Nov 28 10:27:02 UTC 2010
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
Log Message:
Fix merge and ARM define handling.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
