summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-11 16:27:50 -0600
committerBrian Paul <brianp@vmware.com>2009-05-11 16:27:50 -0600
commite7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c (patch)
treeb47a363853d2ed59184c3b9eb72ccb30d00cbebf /progs
parent783e43064b64feb87e0457f96c2275160389f84c (diff)
parentf104e4d666dfccda6f5ad817693216733ddede44 (diff)
downloadexternal_mesa3d-e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c.zip
external_mesa3d-e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c.tar.gz
external_mesa3d-e7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c.tar.bz2
Merge branch 'mesa_7_5_branch'
Conflicts: Makefile src/mesa/main/version.h
Diffstat (limited to 'progs')
-rw-r--r--progs/trivial/tri.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c
index d44cb6a..cac3fcb 100644
--- a/progs/trivial/tri.c
+++ b/progs/trivial/tri.c
@@ -60,6 +60,7 @@ static void Key(unsigned char key, int x, int y)
{
switch (key) {
case 27:
+ glutDestroyWindow(win);
exit(0);
default:
glutPostRedisplay();