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

author	John Darrington <john@darrington.wattle.id.au>
	Fri, 20 Feb 2009 01:26:17 +0000 (10:26 +0900)
committer	John Darrington <john@darrington.wattle.id.au>
	Fri, 20 Feb 2009 01:26:17 +0000 (10:26 +0900)
commit	deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416
tree	9b60a93bf8bb2408b7bfa09a4e21d46f10e22608	tree \| snapshot
parent	8953baa61127d6d3b91f763663ea647bf3e4e793	commit \| diff
parent	ef60a827a20593dcebdb98f509614d7d94e3fe5c	commit \| diff

Merge branch 'master' of /home/john/Development/pspp-window-manager

Conflicts:

src/ui/gui/crosstabs-dialog.c
src/ui/gui/helper.c