projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f2c196 0565612)
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)
Conflicts:
src/math/chart-geometry.c
src/output/cairo-chart.c
src/output/charts/plot-hist-cairo.c
tests/math/chart-geometry.at

1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/ui/gui/automake.mk patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/ui/gui/automake.mk
Simple merge
Unnamed repository; edit this file to name it for gitweb.