Module Name: xsrc
Committed By: snj
Date: Fri Jan 16 21:32:11 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: backlight.c
xsrc/external/mit/xf86-video-intel/dist/src/sna: kgem.c sna_display.c
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel.h
Removed Files:
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_glamor.c
intel_glamor.h uxa-glamor.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/backlight.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel.h
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_glamor.c \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_glamor.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/uxa-glamor.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
