diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
| commit | bee5233a916055d41bb4ee425f5df25b80f50f16 (patch) | |
| tree | 7bfac9716f778ed685e62e2d0830d1905bc08fd2 /openscad.pro | |
| parent | f093b53c3edb08ee0d64c5d6c2a1df723acfca2d (diff) | |
| parent | c5223417e3ffe965d09d971865797206080eb0ae (diff) | |
Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
Conflicts:
src/Preferences.ui
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/openscad.pro b/openscad.pro index 5c39928..20dc299 100644 --- a/openscad.pro +++ b/openscad.pro @@ -222,6 +222,7 @@ HEADERS += src/typedefs.h \ src/highlighter.h \ src/localscope.h \ src/module.h \ + src/feature.h \ src/node.h \ src/csgnode.h \ src/linearextrudenode.h \ @@ -280,6 +281,7 @@ SOURCES += src/version_check.cc \ src/func.cc \ src/localscope.cc \ src/module.cc \ + src/feature.cc \ src/node.cc \ src/context.cc \ src/modcontext.cc \ |