[xorg-x11-drv-intel/f17: 6/6] Merge branch 'f18' into f17

Thu Mar 7 21:57:02 UTC 2013

commit 166c6a8a767c8be55a0bbea62ad5d809cda5c044
Merge: cbd05d7 39544b5
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Mar 7 16:56:51 2013 -0500

    Merge branch 'f18' into f17

 .gitignore              |    1 +
 sources                 |    2 +-
 xorg-x11-drv-intel.spec |   14 +++++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
---