Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 22 Apr 2017 18:56:00 +0000 (20:56 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 22 Apr 2017 18:56:00 +0000 (20:56 +0200)
commit6e097c89af440da90b43ce90864394c4d0c843d5
treed38b0de20569778ce8a20effb988a05d2c82513e
parent50feac63e2fb9776f53e432f137311b4f5563ccf
parent3dd0f6ae0d5eb73a2270a243e443c4ae03c2c16e
Merge remote-tracking branch 'origin/master' into sheet
lib/gtk-contrib/gtkxpaned.c
src/data/variable.c
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-import-assistant.c
src/ui/gui/psppire-import-assistant.h
src/ui/gui/widgets.c