From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 21 Jul 2003 10:53:27 +0000 (-0400)
Subject: Merge
X-Git-Tag: NTP_4_2_0~48^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=472eac55995ce9730fe580dea68d184ecfc7d092;p=thirdparty%2Fntp.git

Merge

bk: 3f1bc627Je-dodniZJIWEkA7lMcdaw
---

472eac55995ce9730fe580dea68d184ecfc7d092
diff --cc configure.in
index 9303860343,d569fcbd26..64500caeb9
--- a/configure.in
+++ b/configure.in
@@@ -5,7 -5,7 +5,7 @@@ AC_CANONICAL_SYSTE
  AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
  AM_CONFIG_HEADER(config.h)
  AC_ARG_PROGRAM
- AM_INIT_AUTOMAKE(ntp, 4.1.80-rc1)
 -AM_INIT_AUTOMAKE(ntp, 4.1.2a)
++AM_INIT_AUTOMAKE(ntp, 4.1.80-rc1a)
  AC_PREREQ(2.53)
  
  ac_cv_var_atom_ok=no