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 /opencsg.pri | |
| 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 'opencsg.pri')
| -rw-r--r-- | opencsg.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opencsg.pri b/opencsg.pri index 02be596..d34f11b 100644 --- a/opencsg.pri +++ b/opencsg.pri @@ -3,8 +3,8 @@ opencsg { CONFIG += glew include(glew.pri) - HEADERS += src/opencsgrenderer.h - SOURCES += src/opencsgrenderer.cc + HEADERS += src/OpenCSGRenderer.h + SOURCES += src/OpenCSGRenderer.cc isEmpty(DEPLOYDIR) { # Optionally specify location of OpenCSG using the |