Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Tue, 28 Mar 2017 15:36:16 +0000 (17:36 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Tue, 28 Mar 2017 15:36:16 +0000 (17:36 +0200)
commit52e144652645cab108fb2db0a970f1ace2cbf2ea
treeeefcfd9ab64fdfe53d8abb7d5a0529003189a036
parent4d4a0bfb5cca98d588344cc5b7d4216e99cd1f17
parentd544788058262e65e71591348d9976a7fd792c97
Merge remote-tracking branch 'origin/master' into sheet
configure.ac
src/ui/gui/automake.mk
src/ui/gui/psppire-data-store.c
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-import-assistant.c
src/ui/gui/widgets.c