[mesa-demos/f18: 6/6] Merge branch 'master' into f18

[Adam Jackson]

commit ee906421879fa2890de26641324243692b5bbdc8
Merge: c15e2c0 fb59eae
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 27 17:23:49 2013 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	mesa-demos.spec
    	sources

 .gitignore      |    3 +++
 mesa-demos.spec |   22 +++++++++++++++++-----
 sources         |    2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)
---
diff --cc mesa-demos.spec
index df6df42,cc28b2a..f006536
--- a/mesa-demos.spec
+++ b/mesa-demos.spec
@@@ -78,6 -83,16 +83,13 @@@ install -m 0755 src/xdemos/glxinfo %{bu
  %{_datadir}/man/man1/xdriinfo.1*
  
  %changelog
+ * Wed Feb 27 2013 Adam Jackson <ajax at redhat.com> 8.1.0-2
+ - Copy glxinfo to glxinfo%%{__isa_bits}, to allow people to check that their
+   compatibility drivers are working.
+ 
+ * Sun Feb 24 2013 Dave Airlie <airlied at redhat.com> 8.1.0-1
+ - package upstream demos release 8.1.0 (mainly for new glxinfo)
+ 
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.0.1-2.20121218git6eef979
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Tue Jan  8 2013 Tom Callaway <spot at fedoraproject.org> - 8.0.1-1.20121218git6eef979
  - update to 8.0.1 (git checkout from 20121218)
  - update xdriinfo to 1.0.4