From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 20 Jun 2015 18:29:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into gtk3
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ccf4f19ece6c4da5a2d13173c032011faf330b8;p=pspp

Merge remote-tracking branch 'origin/master' into gtk3

Conflicts:
	src/math/chart-geometry.c
	src/output/cairo-chart.c
	src/output/charts/plot-hist-cairo.c
	tests/math/chart-geometry.at
---

3ccf4f19ece6c4da5a2d13173c032011faf330b8