From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 31 Aug 2017 06:41:38 +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=8180c5dd1591446174c0753ee960921786113403

Merge remote-tracking branch 'origin/master' into sheet
---

8180c5dd1591446174c0753ee960921786113403
diff --cc NEWS
index 6c2be625e8,1c24e0c359..de670d554e
--- a/NEWS
+++ b/NEWS
@@@ -4,10 -4,16 +4,20 @@@ See the end for copying conditions
  
  Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
  
++Experimental 0.13.1:
 + ** The code implementing the sheet rendering has been removed.  Instead we
 +    use a third party library: spread-sheet-widget.
 +
- Changes from 0.10.2 to 0.10.4
+ Changes from 1.0.0 to 1.0.1:
+ 
+  * Bug fixes, including fixes for CVE-2017-12958, CVE-2017-12959,
+    CVE-2017-12960, and CVE-2017-12961.
+ 
+ Changes from 0.11.0 to 1.0.0:
+ 
+  * Translation updates.
+ 
+ Changes from 0.10.2 to 0.11.0:
  
   * The REGRESSION command now has a /ORIGIN subcommand to perform
     regression through the origin.
diff --cc configure.ac
index 6e7984bf98,f1d344ded2..77b7d79972
--- a/configure.ac
+++ b/configure.ac
@@@ -18,7 -18,7 +18,7 @@@ dnl Process this file with autoconf to 
  
  dnl Initialize.
  AC_PREREQ(2.63)
- AC_INIT([GNU PSPP], [0.10.4], [bug-gnu-pspp@gnu.org], [pspp])
 -AC_INIT([GNU PSPP], [1.0.1], [bug-gnu-pspp@gnu.org], [pspp])
++AC_INIT([GNU PSPP], [0.13.1], [bug-gnu-pspp@gnu.org], [pspp])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_TESTDIR([tests])