diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/MainWindow.h | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/MainWindow.h')
| -rw-r--r-- | src/MainWindow.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/MainWindow.h b/src/MainWindow.h index 0ba3bd9..37a6a4c 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -6,9 +6,7 @@ #include "openscad.h" #include "context.h" #include "module.h" -#include "polyset.h" #include "Tree.h" -#include <QPointer> #include <vector> class MainWindow : public QMainWindow, public Ui::MainWindow |