diff options
| author | Michael Schwarz <michi.schwarz@gmail.com> | 2014-12-25 15:16:42 +0100 |
|---|---|---|
| committer | Michael Schwarz <michi.schwarz@gmail.com> | 2014-12-25 15:16:42 +0100 |
| commit | d08e4be25f157d59075e0b2a669e6388cb462474 (patch) | |
| tree | 29b1363948f6dc83fff4c68052b6924f81d215d8 /.gitignore | |
| parent | 2433482b8768533244480bf15ba759eee3f51969 (diff) | |
| parent | bdf3ae0ae3d66235bbff5710ffe1b34e9d7f12d2 (diff) | |
| download | pogojig-d08e4be25f157d59075e0b2a669e6388cb462474.tar.gz pogojig-d08e4be25f157d59075e0b2a669e6388cb462474.tar.bz2 pogojig-d08e4be25f157d59075e0b2a669e6388cb462474.zip | |
Merge branch 'master' into no-examples
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,5 +1,2 @@ /config.mk *.pyc -*.dxf -*.stl -*.d |