diff options
author | Thomas Karl Pietrowski <thopiekar@googlemail.com> | 2016-11-17 23:10:29 +0300 |
---|---|---|
committer | Thomas Karl Pietrowski <thopiekar@googlemail.com> | 2016-11-17 23:10:29 +0300 |
commit | c48d064ecaaa17871453829a7220f696799a835d (patch) | |
tree | d477d8b2a701b16cd54111aa7af92f131f1a5f41 /.gitignore | |
parent | 273b996cc1dfaa3051cdc928c721fdb304875efc (diff) | |
parent | bf670d325a8a0ed7a1106c99ec28e2404f22e6d1 (diff) |
Merge remote-tracking branch 'UM3NPP/master' into UM3NPP_merge
Contributes to CURA-2862
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index fd01d5ce76..6c4ee96d3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# Compiled and generated things. +#Compiled and generated things. build *.pyc __pycache__ @@ -32,4 +32,5 @@ plugins/Doodle3D-cura-plugin plugins/GodMode plugins/PostProcessingPlugin plugins/UM3NetworkPrinting -plugins/X3GWriter
\ No newline at end of file +plugins/X3GWriter + |