diff options
author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
commit | 997a0afac3f9b3a7aa2c4a8d351c3697bc91f7aa (patch) | |
tree | 3b3816d1557746f5f2e3e86a9239821472012024 /openscad.pro | |
parent | d0de384a7e1642d09726579fdd75f1588cfaada7 (diff) | |
parent | af0658a8fe441ebb0eb3d238e7055fd592343605 (diff) |
Merge branch 'master' and fix bugs
Conflicts:
src/openscad.cc
tests/CMakeLists.txt
Diffstat (limited to 'openscad.pro')
-rw-r--r-- | openscad.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openscad.pro b/openscad.pro index b5190ed..ead5d1f 100644 --- a/openscad.pro +++ b/openscad.pro @@ -372,3 +372,8 @@ INSTALLS += applications icons.path = $$PREFIX/share/pixmaps icons.files = icons/openscad.png INSTALLS += icons + +CONFIG(winconsole) { + include(winconsole.pri) +} + |