diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
| commit | bee5233a916055d41bb4ee425f5df25b80f50f16 (patch) | |
| tree | 7bfac9716f778ed685e62e2d0830d1905bc08fd2 /.gitignore | |
| parent | f093b53c3edb08ee0d64c5d6c2a1df723acfca2d (diff) | |
| parent | c5223417e3ffe965d09d971865797206080eb0ae (diff) | |
Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
Conflicts:
src/Preferences.ui
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -12,4 +12,6 @@ parser_yacc.h /tmp /OpenSCAD.app */#*# +/nbproject /openscad +/tests/openscad_nogui |