diff options
| author | Marius Kintel <marius@kintel.net> | 2011-08-04 02:02:42 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-08-04 02:02:42 (GMT) |
| commit | 2af5648eda19ef006715d02c8a917229824ba5a8 (patch) | |
| tree | b1b727198ae1d68d21c5936fcf99d8231b43fe88 /openscad.pro | |
| parent | c65a3f5d743a75b1e4adc0da46b13a2cf8998def (diff) | |
| parent | 00d7bb401c0732a5f1b33cd0059a643933286c5d (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/OpenCSGRenderer.cc
src/csgops.cc
src/mainwin.cc
src/polyset.cc
src/projection.cc
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openscad.pro b/openscad.pro index a4381be..00d646c 100644 --- a/openscad.pro +++ b/openscad.pro @@ -120,7 +120,7 @@ FORMS += src/MainWindow.ui \ HEADERS += src/renderer.h \ src/cgalrenderer.h \ - src/throwntogetherrenderer.h \ + src/ThrownTogetherRenderer.h \ src/CGAL_renderer.h \ src/OGL_helper.h \ src/GLView.h \ @@ -169,7 +169,7 @@ HEADERS += src/renderer.h \ SOURCES += src/openscad.cc \ src/mainwin.cc \ src/cgalrenderer.cc \ - src/throwntogetherrenderer.cc \ + src/ThrownTogetherRenderer.cc \ src/glview.cc \ src/export.cc \ src/value.cc \ |