From: John Darrington Date: Thu, 3 Aug 2017 05:37:27 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into sheet X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f Merge remote-tracking branch 'origin/master' into sheet --- 5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f diff --cc configure.ac index 492cdd3085,fc8761ad90..6e7984bf98 --- a/configure.ac +++ b/configure.ac @@@ -2,7 -18,7 +18,7 @@@ dnl Process this file with autoconf to dnl Initialize. AC_PREREQ(2.63) - AC_INIT([GNU PSPP], [0.10.5pre1], [bug-gnu-pspp@gnu.org], [pspp]) -AC_INIT([GNU PSPP], [0.10.5-pre3], [bug-gnu-pspp@gnu.org], [pspp]) ++AC_INIT([GNU PSPP], [0.10.4], [bug-gnu-pspp@gnu.org], [pspp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests])