From: Ben Pfaff <blp@gnu.org>
Date: Tue, 2 Feb 2010 04:25:45 +0000 (-0800)
Subject: Merge commit 'v0.6.2' into stable
X-Git-Tag: fc11-i386-build87^0
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa17cb73df7b83d951f58b8594571b22c1658141;hp=bdb8cb5a8380b919657c252fe1c39525c4f2bbfc;p=pspp-builds.git

Merge commit 'v0.6.2' into stable
---

diff --git a/NEWS b/NEWS
index f99fb173..d69be3fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
 PSPP NEWS -- history of user-visible changes.
-Time-stamp: <2009-10-06 20:46:21 blp>
+Time-stamp: <2009-10-11 14:15:35 blp>
 Copyright (C) 1996-9, 2000, 2008, 2009 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
 
-Changes from 0.6.1 to 0.6.2-rc1:
+Changes from 0.6.1 to 0.6.2:
 
   * New translations:
 
diff --git a/configure.ac b/configure.ac
index bb37d215..886b31b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AC_PREREQ(2.60)
-AC_INIT([pspp],[0.6.2-rc1],[bug-gnu-pspp@gnu.org])
+AC_INIT([pspp],[0.6.2],[bug-gnu-pspp@gnu.org])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE