diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /src/export.h | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'src/export.h')
| -rw-r--r-- | src/export.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/export.h b/src/export.h index cba0b23..dd6e3e0 100644 --- a/src/export.h +++ b/src/export.h @@ -5,8 +5,7 @@ #include <iostream> -void cgal_nef3_to_polyset(class PolySet *ps, class CGAL_Nef_polyhedron *root_N); -void export_stl(CGAL_Nef_polyhedron *root_N, std::ostream &output, class QProgressDialog *pd); +void export_stl(class CGAL_Nef_polyhedron *root_N, std::ostream &output, class QProgressDialog *pd); void export_off(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDialog *pd); void export_dxf(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDialog *pd); #endif |