From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 4 Dec 2008 00:14:35 +0000 (+0900)
Subject: Merge branch 'master' into rewrite-sheet
X-Git-Tag: v0.7.1~73
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2165f59ab9eee5272b4037e45477811627cae078;hp=2165f59ab9eee5272b4037e45477811627cae078;p=pspp-builds.git

Merge branch 'master' into rewrite-sheet

Conflicts:

	src/ui/gui/psppire-case-file.c
	src/ui/gui/psppire-case-file.h
---