Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 6 Aug 2016 17:40:31 +0000 (19:40 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 6 Aug 2016 17:40:31 +0000 (19:40 +0200)
commit7293c1a383d325c371bd708401e5a1d7586a4d90
treeae163a3a278be6f5c108e8a9d338c5d973ba58ce
parentf9b2322d7b0662bd313d9c63450638c39b88be70
parent258cbd9cdf386687122b0854274923acafc786d4
Merge remote-tracking branch 'origin/master' into sheet

Conflicts:
src/ui/gui/automake.mk
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-data-sheet.c
src/ui/gui/psppire-var-sheet.c
23 files changed:
configure.ac
src/ui/gui/automake.mk
src/ui/gui/pspp-sheet-private.h
src/ui/gui/pspp-sheet-selection.c
src/ui/gui/pspp-sheet-selection.h
src/ui/gui/pspp-sheet-view-column.c
src/ui/gui/pspp-sheet-view-column.h
src/ui/gui/pspp-sheet-view.c
src/ui/gui/pspp-sheet-view.h
src/ui/gui/pspp-widget-facade.c
src/ui/gui/pspp-widget-facade.h
src/ui/gui/psppire-button-editable.c
src/ui/gui/psppire-button-editable.h
src/ui/gui/psppire-cell-renderer-button.c
src/ui/gui/psppire-cell-renderer-button.h
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-data-editor.h
src/ui/gui/psppire-data-sheet.c
src/ui/gui/psppire-data-sheet.h
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-import-assistant.c
src/ui/gui/psppire-var-sheet.h
src/ui/gui/widgets.c