pintos-os.org Git - pspp-builds.git/commit

author	John Darrington <john@darrington.wattle.id.au>
	Wed, 26 Nov 2008 04:28:36 +0000 (13:28 +0900)
committer	John Darrington <john@darrington.wattle.id.au>
	Wed, 26 Nov 2008 04:28:36 +0000 (13:28 +0900)
commit	e59613aae24bbddcaba25415a67dcf2010ebb55c
tree	adf199c18f6a7b03068e809a3537b808a4613259	tree \| snapshot
parent	f79c3114efb645934af16035e489fdedc4cab85e	commit \| diff
parent	04bc6ee1d86faf2b0d42590dd31e8a984f7f0418	commit \| diff

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

Conflicts:

lib/gtksheet/automake.mk