diff options
| author | Gard Spreemann <gspreemann@gmail.com> | 2017-04-20 11:15:58 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspreemann@gmail.com> | 2017-04-20 11:15:58 +0200 |
| commit | eadd3e18b55fc3b7a7d0420015902df2d58dcea5 (patch) | |
| tree | ce025060ea9045415b1f738886c8c70ed32218e8 /GudhUI/gui/Menu_edge_contraction.h | |
| parent | 5638527781e1d8cd916cd28f9d375eef7b5d820b (diff) | |
| parent | 8d7329f3e5ad843e553c3c5503cecc28ef2eead6 (diff) | |
Merge tag 'upstream/2.0.0' into dfsg/latest
Upstream's 2.0.0 release.
Diffstat (limited to 'GudhUI/gui/Menu_edge_contraction.h')
| -rw-r--r-- | GudhUI/gui/Menu_edge_contraction.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/GudhUI/gui/Menu_edge_contraction.h b/GudhUI/gui/Menu_edge_contraction.h index 08f0bf67..2d5640e8 100644 --- a/GudhUI/gui/Menu_edge_contraction.h +++ b/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" |