Merge remote branch 'origin/master' into arb_geometry_shader4arb_geometry_shader4

Conflicts:
	src/gallium/auxiliary/tgsi/tgsi_exec.c
	src/mesa/glapi/glapitemp.h
	src/mesa/glapi/glprocs.h
	src/mesa/main/enums.c
	src/mesa/main/remap_helper.h
	src/mesa/state_tracker/st_atom_shader.c
	src/mesa/state_tracker/st_program.c
	src/mesa/state_tracker/st_program.h

1 files changed, 1 insertions, 1 deletions

diff --git a/progs/trivial/tri-alpha.c b/progs/trivial/tri-alpha.c
index aec1cbb377..bd1c88ecf8 100644
--- a/progs/trivial/tri-alpha.c
+++ b/progs/trivial/tri-alpha.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
       case 27:
 	exit(1);
       default:
-	return;
+	break;
     }
 
     glutPostRedisplay();