Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	configure.ac
	progs/demos/morph3d.c
	progs/demos/textures.c
	progs/glsl/shtest.c
	progs/glsl/texaaline.c
	progs/tests/packedpixels.c
	progs/xdemos/corender.c
	src/mesa/main/version.h

1 files changed, 1 insertions, 1 deletions

diff --git a/progs/trivial/createwin.c b/progs/trivial/createwin.c
index 04a088642b8..93da30ee294 100644
--- a/progs/trivial/createwin.c
+++ b/progs/trivial/createwin.c
@@ -116,6 +116,6 @@ int main(int argc, char **argv)
     glutReshapeFunc(Reshape);
     glutKeyboardFunc(Key);
     glutDisplayFunc(Draw);
-//    glutMainLoop();
+    /* glutMainLoop(); */
 	return 0;
 }