diff options
| author | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
| commit | 6882228058d313bb7b98fddd90239bdb1a3e25ef (patch) | |
| tree | 9e3f0077a319939df7496fc6b18350c44cc4b0ec /opencsg.pri | |
| parent | dd9dfcb4ece4dcd1ae7f3374ef03a4babdb91dd8 (diff) | |
| parent | c79ad5010e4ae8a612de5423cd52a518ed6b4d65 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.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 8538f99..02be596 100644 --- a/opencsg.pri +++ b/opencsg.pri @@ -3,8 +3,8 @@ opencsg { CONFIG += glew include(glew.pri) - HEADERS += src/render-opencsg.h - SOURCES += src/render-opencsg.cc + HEADERS += src/opencsgrenderer.h + SOURCES += src/opencsgrenderer.cc isEmpty(DEPLOYDIR) { # Optionally specify location of OpenCSG using the |