diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
| commit | a4a64e7c26a0eb523f5b271c9d90f091e5933ebb (patch) | |
| tree | 6e247c3f46c23a6c85b4740a2ff99abaa25fe9bd /openscad.pro | |
| parent | 51f24b998ba555d15f924ccd4fb5b46219f6537b (diff) | |
| parent | f577f91d25071f5ad1a9fdb6ed7c6dd3aa4c1008 (diff) | |
Merge remote-tracking branch 'upstream/master' into cakebaby
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openscad.pro b/openscad.pro index 4a1c0f3..31c1e15 100644 --- a/openscad.pro +++ b/openscad.pro @@ -159,7 +159,8 @@ include(boost.pri) FORMS += src/MainWindow.ui \ - src/Preferences.ui + src/Preferences.ui \ + src/OpenCSGWarningDialog.ui HEADERS += src/renderer.h \ src/ThrownTogetherRenderer.h \ @@ -168,6 +169,7 @@ HEADERS += src/renderer.h \ src/GLView.h \ src/MainWindow.h \ src/Preferences.h \ + src/OpenCSGWarningDialog.h \ src/builtin.h \ src/context.h \ src/csgterm.h \ @@ -247,6 +249,7 @@ SOURCES += src/openscad.cc \ src/highlighter.cc \ src/printutils.cc \ src/Preferences.cc \ + src/OpenCSGWarningDialog.cc \ src/progress.cc \ src/editor.cc \ src/traverser.cc \ @@ -274,7 +277,6 @@ SOURCES += src/cgalutils.cc \ src/CGALRenderer.cc \ src/CGAL_Nef_polyhedron.cc \ src/CGAL_Nef_polyhedron_DxfData.cc \ - src/cgaladv_convexhull2.cc \ src/cgaladv_minkowski2.cc } |