From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 26 Nov 2008 04:28:36 +0000 (+0900)
Subject: Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite... 
X-Git-Tag: v0.7.1~112
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e59613aae24bbddcaba25415a67dcf2010ebb55c;p=pspp-builds.git

Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite-sheet

Conflicts:

	lib/gtksheet/automake.mk
---

e59613aae24bbddcaba25415a67dcf2010ebb55c