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)
commitd4ff0e074d703dbeb8af5aa3ac470ddda5ebe301
treecfd9d1043973094eec4e14422e774f5dcb566bcf
parentba434f2f8eac8b4feee75d9ce4cc67afd30fcd92
parent59adcae3665ff8c591c6aa6558b012524bb8e765
Merge remote-tracking branch 'origin/master' into sheet
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/widgets.c