diff options
| author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-22 16:49:21 +0000 |
|---|---|---|
| committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-02-22 16:49:21 +0000 |
| commit | 899838ae83f4a9cea085ba877e91a7ca035fbb4d (patch) | |
| tree | 76c56df09e6ad006f94aa46b0d355492e4830f4b /src/GudhUI/gui/Menu_edge_contraction.h | |
| parent | 81575612aaa0552307a6c744c327765ff89165e4 (diff) | |
| parent | 707120336966af3dffb8b54cd0095fc1bcc3836d (diff) | |
Merged with trunk + minor changes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@2094 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6b23778cbe43e7697cd325039e843758a263d927
Diffstat (limited to 'src/GudhUI/gui/Menu_edge_contraction.h')
| -rw-r--r-- | src/GudhUI/gui/Menu_edge_contraction.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/GudhUI/gui/Menu_edge_contraction.h b/src/GudhUI/gui/Menu_edge_contraction.h index 08f0bf67..2d5640e8 100644 --- a/src/GudhUI/gui/Menu_edge_contraction.h +++ b/src/GudhUI/gui/Menu_edge_contraction.h @@ -23,11 +23,8 @@ #ifndef GUI_MENU_EDGE_CONTRACTION_H_ #define GUI_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" +#include "ui_MenuEdgeContraction.h" #include "model/Model.h" |