From: David Schweikert <david@schweikert.ch>
Date: Thu, 15 Dec 2011 13:47:49 +0000 (+0100)
Subject: merge changes from Tobias Oetiker (already committed in master)
X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e162406e27a39a4691c6c9513a2fddcf4ba5032;p=fping.git

merge changes from Tobias Oetiker (already committed in master)
---

7e162406e27a39a4691c6c9513a2fddcf4ba5032
diff --cc fping.c
index 98ee09d,3f240c6..6db4cf7
mode 100755,100644..100644
--- a/fping.c
+++ b/fping.c
@@@ -20,10 -24,13 +20,11 @@@
   *
   * Original author:  Roland Schemers  <schemers@stanford.edu>
   * IPv6 Support:     Jeroen Massar    <jeroen@unfix.org / jeroen@ipng.nl>
-- * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
 + * Improved main loop: David Schweikert <david@schweikert.ch>
+  * Debian Merge, TOS settings: Tobi Oetiker <tobi@oetiker.ch>
++ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
   *
   *
 - * RCS header information no longer used.  It has been moved to the
 - * ChangeLog file.
 - *
   * Redistribution and use in source and binary forms are permitted
   * provided that the above copyright notice and this paragraph are
   * duplicated in all such forms and that any documentation,