Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/gallium.py
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/ir_variable.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/formats.h
	mesalib/src/mesa/main/texcompress.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/sources.mak

1 files changed, 1 insertions, 1 deletions

diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py
index 99481a410..28e505460 100644
--- a/mesalib/scons/gallium.py
+++ b/mesalib/scons/gallium.py
@@ -363,7 +363,7 @@ def generate(env):
             ccflags += ['-O3']

         # Work around aliasing bugs - developers should comment this out

         ccflags += ['-fno-strict-aliasing']

-        ccflags += ['-g3']

+        ccflags += ['-g']

         if env['build'] in ('checked', 'profile'):

             # See http://code.google.com/p/jrfonseca/wiki/Gprof2Dot#Which_options_should_I_pass_to_gcc_when_compiling_for_profiling?

             ccflags += [