Merge remote-tracking branch 'origin/master' into gtk3
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 20 Jun 2015 18:29:42 +0000 (20:29 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 20 Jun 2015 18:29:42 +0000 (20:29 +0200)
commit3ccf4f19ece6c4da5a2d13173c032011faf330b8
tree6c64f8dce4ee2608c87f92f8df7e0074f6284b5e
parent9f2c196194f630775345533b355d536018f690e5
parent0565612313eae2afabdb3ef50a6b730f9a844bbd
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
configure.ac
src/ui/gui/automake.mk