Merge remote-tracking branch 'anholt/glamor-reformat'
authorKeith Packard <keithp@keithp.com>
Mon, 27 Jan 2014 22:11:09 +0000 (14:11 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 27 Jan 2014 22:11:09 +0000 (14:11 -0800)
commit0fbb3d711efec5222a57b45a70d28fc98380f3a1
tree86dbf8bc68bd9471cd40e52589811e56ec595b80
parent7ddef4f7033c10b6e92866182d4475a4d49c5083
parentb98e49379c8d7cecce991207048489f51b10028c
Merge remote-tracking branch 'anholt/glamor-reformat'

Conflicts:
Makefile.am

Conflict caused by adding PSEUDORAMIX and GLAMOR directory defines in
separate branches
Makefile.am
configure.ac
include/dix-config.h.in