From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Sat, 24 Dec 2016 12:44:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/merge-requests/451'
X-Git-Tag: v1.4~235
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=55ff3d3a51f6612ea29e4e684f70f7e6eee6150a

Merge remote-tracking branch 'github/merge-requests/451'

* github/merge-requests/451:
  Move pan-view components to their own subdir.
  Update the automake file with new headers
  Refactor pan-types.h into discrete header files for each pan-view code module
  Fix errors in -Werror (except GdkPixbuf deprecation warnings)
---

55ff3d3a51f6612ea29e4e684f70f7e6eee6150a
diff --cc src/view_file.c
index da409814,3f424ca1..24725947
--- a/src/view_file.c
+++ b/src/view_file.c
@@@ -21,7 -21,8 +21,9 @@@
  #include "main.h"
  #include "view_file.h"
  
 +#include "dupe.h"
+ #include "collect.h"
+ #include "collect-table.h"
  #include "editors.h"
  #include "layout.h"
  #include "menu.h"