merge latest changes

11 years ago · b01f282727
parent 0ab66f80de 741236e576
commit b01f282727
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -1,6 +1,8 @@
 UNRELEASED
  * Allow running as non-root on Mac OS X by using non-privileged ICMP (#7)

+2013-10-10  David Schweikert  <david@schweikert.ch>
+  * Version 3.6
  * Fix loop issue after 65536 pings (reported by Peter Folk and GBert, #12)
  * Minimum ping data size is now 0
  * Removed setsockopt IPV6_CHECKSUM, which shouldn't be set and breaks
--- a/configure.ac
+++ b/configure.ac
@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)

-AC_INIT([fping],[3.6-rc2])
+AC_INIT([fping],[3.6])

 dnl make ipv4 and ipv6 options
 AC_ARG_ENABLE([ipv4],