diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-26 23:09:27 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-26 23:09:27 (GMT) |
| commit | 1c44d04e00534df1e541be5e2bb87d7c676997ef (patch) | |
| tree | 235aaf6f0e8acd6bf7b9a9f0cfa17bdecd554270 | |
| parent | 8c02f17bb3614bc6f31c45a42fdf4a55d74a8e50 (diff) | |
| parent | 41ab9e8ab613d6d33ade2fa4db1fe93878993282 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rw-r--r-- | openscad.appdata.xml | 2 | ||||
| -rw-r--r-- | openscad.pro | 8 | ||||
| -rw-r--r-- | src/dxftess-cgal.cc | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/openscad.appdata.xml b/openscad.appdata.xml index 8334d37..0378d15 100644 --- a/openscad.appdata.xml +++ b/openscad.appdata.xml @@ -10,7 +10,7 @@ </description> <screenshots> <screenshot type="default" width="800" height="437">http://www.openscad.org/images/appdata-screenshot-1.png</screenshot> - <screenshot type="default" width="800" height="465">http://www.openscad.org/images/appdata-screenshot-2.png</screenshot> + <screenshot width="800" height="465">http://www.openscad.org/images/appdata-screenshot-2.png</screenshot> </screenshots> <url type="homepage">http://www.openscad.org/</url> </application> diff --git a/openscad.pro b/openscad.pro index ec5af20..6d8282a 100644 --- a/openscad.pro +++ b/openscad.pro @@ -416,10 +416,18 @@ applications.path = $$PREFIX/share/applications applications.files = icons/openscad.desktop INSTALLS += applications +appdata.path = $$PREFIX/share/appdata +appdata.files = openscad.appdata.xml +INSTALLS += appdata + icons.path = $$PREFIX/share/pixmaps icons.files = icons/openscad.png INSTALLS += icons +man.path = $$PREFIX/share/man/man1 +man.files = doc/openscad.1 +INSTALLS += man + CONFIG(winconsole) { include(winconsole.pri) } diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc index 14f1204..5f95e6a 100644 --- a/src/dxftess-cgal.cc +++ b/src/dxftess-cgal.cc @@ -471,7 +471,7 @@ bool triangulate_polygon( const PolySet::Polygon &pgon, std::vector<PolySet::Pol triangles.push_back( pgon ); } } - } catch (const CGAL::Assertion_exception &e) { + } catch (const CGAL::Failure_exception &e) { PRINTB("CGAL error in dxftess triangulate_polygon: %s", e.what()); err = true; } |