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

author	John Darrington <john@darrington.wattle.id.au>
	Wed, 19 Nov 2008 08:21:33 +0000 (17:21 +0900)
committer	John Darrington <john@darrington.wattle.id.au>
	Wed, 19 Nov 2008 08:21:33 +0000 (17:21 +0900)
commit	5e1469fde0a9b5bd3fefe52d7d8379b7379a618b
tree	e9decf2a671d0d11ddb84125a8468d52ce9f4edd	tree \| snapshot
parent	0ab438f96c6a22fed99b56682c0f57acd0f1aced	commit \| diff
parent	6351e3631c90fe46d70a8801a7a32f289cbba08f	commit \| diff

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

Conflicts:

lib/gtksheet/gtksheet.c