Merge remote-tracking branch 'origin/master' into sheet

diff --cc configure.ac
Simple merge

diff --cc src/ui/gui/automake.mk
Simple merge

diff --cc src/ui/gui/psppire-data-store.c
Simple merge

diff --cc src/ui/gui/psppire-data-window.c
index b4c9b09dac21251a56d6bbe2b651742e79dbed18,c9f87d7f6718073174f9c41ae7b2381aad1118a2..1cc5efe8fb4e036f7abdea7c49c6670568335b5e
--- 1/src/ui/gui/psppire-data-window.c
--- 2/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@@ -45,9 -47,8 +45,10 @@@
  #include "gl/c-strcasestr.h"
  #include "gl/xvasprintf.h"
  
 +#include "ui/gui/efficient-sheet/jmd-sheet.h"
 +
  #include "find-dialog.h"
+ #include "options-dialog.h"
  #include "psppire-dialog-action-1sks.h"
  #include "psppire-dialog-action-aggregate.h"
  #include "psppire-dialog-action-autorecode.h"

diff --cc src/ui/gui/psppire-import-assistant.c
Simple merge

diff --cc src/ui/gui/widgets.c
Simple merge