summaryrefslogtreecommitdiff
path: root/progs/trivial
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-10-17 14:13:00 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-10-17 14:13:00 -0600
commit87a6fe57e85ea5f273e808211a0e61d2b837b8e2 (patch)
tree0ed8f21ce93e75f21b41bad302bfc057255bb17d /progs/trivial
parentb50a0b89d946cac3c18a84c3a77cc8dcf96eeec7 (diff)
parentd422c1eb5c0fac8f946758ecce96072505c77683 (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts: progs/trivial/tri.c
Diffstat (limited to 'progs/trivial')
-rw-r--r--progs/trivial/tri.c17
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)