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 /src/mainwin.cc | |
| 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 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index 5bc16cb..badb01f 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -41,14 +41,14 @@ #include "progress.h" #ifdef ENABLE_OPENCSG #include "CSGTermEvaluator.h" -#include "opencsgRenderer.h" +#include "OpenCSGRenderer.h" #endif #ifdef USE_PROGRESSWIDGET #include "ProgressWidget.h" #endif #include "CGALEvaluator.h" #include "PolySetCGALEvaluator.h" -#include "thrownTogetherRenderer.h" +#include "ThrownTogetherRenderer.h" #include <QMenu> #include <QTime> |