Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	progs/trivial/tri.c

1 files changed, 7 insertions, 10 deletions

diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c
index aa45adb6c2..d3c6b59ea5 100644
--- a/progs/trivial/tri.c
+++ b/progs/trivial/tri.c
@@ -57,16 +57,13 @@ static void Reshape(int width, int height)
 
 static void Key(unsigned char key, int x, int y)
 {
-
-    switch (key) {
-      case 27:
-         glutDestroyWindow(win);
-	exit(0);
-      default:
-	return;
-    }
-
-    glutPostRedisplay();
+   switch (key) {
+   case 27:
+      exit(0);
+   default:
+      glutPostRedisplay();
+      return;
+   }
 }
 
 static void Draw(void)