Merge master and fix conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/progs/demos/shadowtex.c b/progs/demos/shadowtex.c
index f10a01ec26..dc5a4bbc48 100644
--- a/progs/demos/shadowtex.c
+++ b/progs/demos/shadowtex.c
@@ -788,6 +788,7 @@ Key(unsigned char key, int x, int y)
          exit(0);
          break;
    }
+   fflush(stdout);
    glutPostRedisplay();
 }
 
@@ -1014,6 +1015,7 @@ PrintHelp(void)
    printf("  <shift> + cursor keys = rotate light source\n");
    if (HaveEXTshadowFuncs)
       printf("  o = cycle through comparison modes\n");
+   fflush(stdout);
 }