mesa: Changes to 'master'

[Kristian Høgsberg]

The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 progs/demos/Makefile  |    2 +-
 src/glx/x11/dri_glx.c |   18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

       via  c016f329abb3d638442bf0b0f27d8f34ebf54f86 (commit)
      from  da3e48186dc25f40925ca89b08baa5cd34143647 (commit)


- Commits -----------------------------------------------
commit c016f329abb3d638442bf0b0f27d8f34ebf54f86
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Tue Apr 8 18:26:24 2008 -0400

    Only convert configs if screen creation was successful.
    
    Thanks to Adam Jackson for pointing it out.

---------------------------------