Commit Diff


commit - 1f01014c15777ba6a21fef4a06ce3b181ab1c037
commit + 0ca66e5e15801ca802d0821c046b892a1398535f
blob - 7118ce28772870a4ed53c3d6b676fa50c18ba3b4
blob + 5e41dda4856ffcbeb9115d632e62ced22dcffb82
--- CHANGELOG
+++ CHANGELOG
@@ -6,6 +6,11 @@ other than OpenBSD.
 
 All changes are on top of the versioned changes listed in CHANGES.
 
+# got-portable 0.68.1 (2022-03-22)
+
+* portable: fix up a bad merge whereby a code block that should have been
+  removed was left in-situ.
+
 # got-portable 0.68 (2022-03-22)
 
 * Changes from got-0.68
blob - 7ffb866bee5a76420929d9ea37c2d6594611725e
blob + 28c96a6b6a71ed786a82c16361c520afaeec208d
--- configure.ac
+++ configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([got-portable], [0.68], [thomas@xteddy.org])
+AC_INIT([got-portable], [0.68.1], [thomas@xteddy.org])
 AC_CONFIG_AUX_DIR(etc)
 AC_CONFIG_SRCDIR([lib/rcsutil.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects])