Eric Anholt 6d49548849 Merge remote-tracking branch 'origin/master' into glamor-next ... I've done this merge manually to resolve the minor conflict in glamor.c. Signed-off-by: Eric Anholt <eric@anholt.net>		2014-07-17 18:07:26 -07:00
..
ephyr	Merge remote-tracking branch 'origin/master' into glamor-next	2014-07-17 18:07:26 -07:00
fake	Replace INCLUDES with AM_CPPFLAGS	2013-08-06 13:08:13 +10:00
fbdev	Replace INCLUDES with AM_CPPFLAGS	2013-08-06 13:08:13 +10:00
linux	kdrive: Ignore failure to chown console tty to current user	2014-04-18 16:30:17 -07:00
src	Merge remote-tracking branch 'origin/master' into glamor-next	2014-07-17 18:07:26 -07:00
Makefile.am	Catch errors in recursive relink targets	2010-03-22 00:45:57 -05:00
Xkdrive.man	The great kdrive purge.	2008-05-16 08:16:01 -04:00