From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 10 Sep 2017 18:11:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/sheet'
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=17ca35e4ca8abf4ba0c0ae82920b985fa17648cf

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

17ca35e4ca8abf4ba0c0ae82920b985fa17648cf
diff --cc NEWS
index 1c24e0c359,de670d554e..a02b144f4d
--- a/NEWS
+++ b/NEWS
@@@ -4,6 -4,10 +4,11 @@@ See the end for copying conditions
  
  Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
  
 -Experimental 0.13.1:
++Changes from 1.0.1 to 1.1.0:
++
+  ** The code implementing the sheet rendering has been removed.  Instead we
+     use a third party library: spread-sheet-widget.
+ 
  Changes from 1.0.0 to 1.0.1:
  
   * Bug fixes, including fixes for CVE-2017-12958, CVE-2017-12959,
diff --cc configure.ac
index f1d344ded2,8c139c2c45..f6293d1cb2
--- 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], [1.0.1], [bug-gnu-pspp@gnu.org], [pspp])
 -AC_INIT([GNU PSPP], [0.13.1], [bug-gnu-pspp@gnu.org], [pspp])
++AC_INIT([GNU PSPP], [1.1.0], [bug-gnu-pspp@gnu.org], [pspp])
  AC_CONFIG_AUX_DIR([build-aux])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_TESTDIR([tests])