summaryrefslogtreecommitdiff
path: root/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-01-04 22:07:32 (GMT)
committerMarius Kintel <marius@kintel.net>2012-01-04 22:07:32 (GMT)
commitfdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch)
tree6a779b50ef65474af9c539ad7d42268f7e760ae8 /testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
parentcbabbaed700536b3a1f513fd5a07d25382cb137f (diff)
parentba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff)
Merge branch 'master' into boost_filesystem
Conflicts: boost.pri src/lexer.l tests/CMakeLists.txt
Diffstat (limited to 'testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad')
-rw-r--r--testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad4
1 files changed, 3 insertions, 1 deletions
diff --git a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
index 140c4ed..c34632c 100644
--- a/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
+++ b/testdata/scad/features/sub1/sub2/sub3/sub4/include-test2.scad
@@ -4,7 +4,9 @@ include <include-test3.scad>
//Test relative file location
include <../include-test4.scad>
-module test2 ()
+test2_variable = 0.7;
+
+module test2()
{
cube(center=true);
}
contact: Jan Huwald // Impressum