diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-13 17:19:34 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-13 17:19:34 (GMT) |
| commit | e77615be3027cfe365e3e52f3ed609dae9711028 (patch) | |
| tree | 21babea118b3bc59037e4e487a4c6bd6811b5412 /src/highlighter.cc | |
| parent | 0f22d6e9ad562e87ae484a82df56ddee30e87343 (diff) | |
| parent | 4401a136b9cbf01aa99cfdf5d9d67d62579dd853 (diff) | |
Merge branch 'children' of git://github.com/vicnet/openscad into vicnet-children
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'src/highlighter.cc')
| -rw-r--r-- | src/highlighter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/highlighter.cc b/src/highlighter.cc index 4b4aa30..1da0e88 100644 --- a/src/highlighter.cc +++ b/src/highlighter.cc @@ -154,7 +154,7 @@ Highlighter::Highlighter(QTextDocument *parent) tokentypes["import"] << "include" << "use" << "import_stl" << "import" << "import_dxf" << "dxf_dim" << "dxf_cross" << "surface"; typeformats["import"].setForeground(Qt::darkYellow); - tokentypes["special"] << "$children" << "child" << "$fn" << "$fa" << "$fs" << "$t" << "$vpt" << "$vpr"; + tokentypes["special"] << "$children" << "child" << "children" << "$fn" << "$fa" << "$fs" << "$t" << "$vpt" << "$vpr"; typeformats["special"].setForeground(Qt::darkGreen); tokentypes["extrude"] << "linear_extrude" << "rotate_extrude"; |