From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 20 Feb 2009 01:26:17 +0000 (+0900)
Subject: Merge branch 'master' of /home/john/Development/pspp-window-manager
X-Git-Tag: v0.7.3~296^2~8
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416

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

Conflicts:

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

deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416