From: Florian Forster <ff@octo.it>
Date: Fri, 13 Feb 2015 12:46:06 +0000 (+0100)
Subject: Merge branches 'mark' and 'timeout'
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0a2a9fe209b27e37d15096fa730bac9520dfeced;p=liboping.git

Merge branches 'mark' and 'timeout'
---

0a2a9fe209b27e37d15096fa730bac9520dfeced
diff --cc src/oping.c
index 5442d60,3ae226c..6263a4d
--- a/src/oping.c
+++ b/src/oping.c
@@@ -647,7 -647,7 +649,7 @@@ static int read_options (int argc, cha
  
  	while (1)
  	{
- 		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:m:"
 -		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:w:"
++		optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:m:w:"
  #if USE_NCURSES
  				"uUg:"
  #endif