Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 18 May 2017 16:28:21 +0000 (18:28 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 18 May 2017 16:28:21 +0000 (18:28 +0200)
1  2 
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/widgets.c

Simple merge
Simple merge
Simple merge