xserver: Branch 'master'

[Dave Airlie]

 GL/mesa/shader/slang/Makefile.am |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

New commits:
diff-tree b8f846a9dfc6697d59ad5482ba7c9d738875318e (from a63ee90bc2d490f6c5c1802c164391963cf6c1d9)
Author: Dave Airlie <airlied at linux.ie>
Date:   Tue Mar 27 14:17:40 2007 +1000

    gl: oops dodgy s appeared pointed out by jcristau on irc..

diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 479de63..4bd48e9 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -18,8 +18,7 @@ INCLUDES = -I at MESA_SOURCE@/include \
            -I../.. \
            -I$(top_srcdir)/hw/xfree86/os-support
 
-nodist_libslang_la_SOURCES = s
-		      slang_builtin.c \
+nodist_libslang_la_SOURCES = slang_builtin.c \
 		      slang_codegen.c \
 		      slang_compile.c \
 		      slang_compile_function.c \