diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-23 20:14:12 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-23 20:14:12 (GMT) |
| commit | d6efe5cbcb99f7730b47b5945f305f08b5d21b94 (patch) | |
| tree | eb429be5acf82a5710d9879dd5fd00b62f1788b7 /tests/regression/dumptest/import-expected.txt | |
| parent | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (diff) | |
| parent | 10c96326866c8256e82f0092a18f4f4e3ca06a74 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'tests/regression/dumptest/import-expected.txt')
| -rw-r--r-- | tests/regression/dumptest/import-expected.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regression/dumptest/import-expected.txt b/tests/regression/dumptest/import-expected.txt index 2c66bf4..b1d81de 100644 --- a/tests/regression/dumptest/import-expected.txt +++ b/tests/regression/dumptest/import-expected.txt @@ -1,2 +1,2 @@ - import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 1); + import(file = "", layer = "", origin = [0, 0], scale = 1, convexity = 1, $fn = 0, $fa = 12, $fs = 2); |