From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 28 Mar 2017 15:36:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into sheet
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52e144652645cab108fb2db0a970f1ace2cbf2ea;p=pspp

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

52e144652645cab108fb2db0a970f1ace2cbf2ea
diff --cc src/ui/gui/psppire-data-window.c
index b4c9b09dac,c9f87d7f67..1cc5efe8fb
--- a/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"