diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
| commit | 23f6b0623c86eba96dfb1296b862522cf02b0734 (patch) | |
| tree | 998500ef16763f6f08f9f7cb8917c98b1643af68 /src/openscad.h | |
| parent | 52dfffd97ba49b603b4814d843cd9be08d040364 (diff) | |
| parent | 5044ea928d72da800d11b2b80f6148265c13d10f (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'src/openscad.h')
| -rw-r--r-- | src/openscad.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/openscad.h b/src/openscad.h index 61aec0e..dab14cd 100644 --- a/src/openscad.h +++ b/src/openscad.h @@ -32,15 +32,13 @@ extern int get_fragments_from_r(double r, double fn, double fs, double fa); #include <string> extern std::string commandline_commands; -extern int parser_error_pos; #include <QString> // The CWD when application started. We shouldn't change CWD, but until we stop // doing this, use currentdir to get the original CWD. -extern QString currentdir; +extern std::string currentdir; extern QString examplesdir; -extern QString librarydir; #endif |