From: Andre Noll <maan@systemlinux.org>
Date: Mon, 16 Feb 2009 22:38:16 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.3.4~57^2~19
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=6ba0a5055cfdec25d54d90a56f9345d5d4be09be;hp=5d67c3dcd623fb61ca6ec4b427eeeb51daeca71e

Merge commit 'fml/master'
---

diff --git a/gui.c b/gui.c
index 0a8f0818..4862df5e 100644
--- a/gui.c
+++ b/gui.c
@@ -896,7 +896,7 @@ static int open_audiod_pipe(void)
  * when any key is pressed.
  *
  * EXTERNAL_MODE: Check only signal pipe. Used when an external command
- * is running. During that thime curses is disabled.  Returns when
+ * is running. During that time curses is disabled.  Returns when
  * cmd_pid == 0.
  */
 static int do_select(int mode)