Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h

1 files changed, 1 insertions, 0 deletions

diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c
index d44cb6a9fe3..cac3fcb7d9c 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();