diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-02 13:13:38 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-02 13:13:38 +0000 |
| commit | c14909eae41883308428095758360de3a7202a0d (patch) | |
| tree | 6c3c40dbe6c006ec65a54a6373b5e6129012a4fb /src/GudhUI/gui/Menu_edge_contraction.h | |
| parent | 91b4846b860988f94346cdf1302c1cfd965c3d27 (diff) | |
Backmerge of trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@820 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 812e0b84d187dd5e30a6a18c12612ebc9bf9206a
Diffstat (limited to 'src/GudhUI/gui/Menu_edge_contraction.h')
| -rw-r--r-- | src/GudhUI/gui/Menu_edge_contraction.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/GudhUI/gui/Menu_edge_contraction.h b/src/GudhUI/gui/Menu_edge_contraction.h index e497a90f..81d37bd8 100644 --- a/src/GudhUI/gui/Menu_edge_contraction.h +++ b/src/GudhUI/gui/Menu_edge_contraction.h @@ -8,6 +8,8 @@ #ifndef MENU_EDGE_CONTRACTION_H_ #define MENU_EDGE_CONTRACTION_H_ +// Workaround for moc-qt4 not parsing boost headers +#include <CGAL/config.h> #include "gui/MainWindow.h" #include "gui/ui_MenuEdgeContraction.h" |